diff -ur ganeti-2.6.2/test/cli-test.bash ganeti-2.6.2.new/test/cli-test.bash
--- ganeti-2.6.2/test/cli-test.bash	2012-12-21 06:38:52.000000000 -0800
+++ ganeti-2.6.2.new/test/cli-test.bash	2012-12-23 22:29:14.886372066 -0800
@@ -3,6 +3,7 @@
 export SCRIPTS=${TOP_BUILDDIR:-.}/scripts
 export DAEMONS=${TOP_BUILDDIR:-.}/daemons
 
-shelltest $SHELLTESTARGS \
-  ${TOP_SRCDIR:-.}/test/gnt-*.test \
-  -- --hide-successes
+# Skip shelltest until package is in portage
+#shelltest $SHELLTESTARGS \
+#  ${TOP_SRCDIR:-.}/test/gnt-*.test \
+#  -- --hide-successes
diff -ur ganeti-2.6.2/test/ganeti.hooks_unittest.py ganeti-2.6.2.new/test/ganeti.hooks_unittest.py
--- ganeti-2.6.2/test/ganeti.hooks_unittest.py	2012-12-21 06:38:52.000000000 -0800
+++ ganeti-2.6.2.new/test/ganeti.hooks_unittest.py	2012-12-23 22:30:34.902373826 -0800
@@ -191,7 +191,7 @@
       os.symlink("/usr/bin/env", fname)
       self.torm.append((fname, False))
       env_snt = {"PHASE": phase}
-      env_exp = "PHASE=%s" % phase
+      env_exp = "LD_PRELOAD=libsandbox.so\\nPHASE=%s" % phase
       self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
                            [(self._rname(fname), HKR_SUCCESS, env_exp)])
 
diff -ur ganeti-2.6.2/test/ganeti.utils.process_unittest.py ganeti-2.6.2.new/test/ganeti.utils.process_unittest.py
--- ganeti-2.6.2/test/ganeti.utils.process_unittest.py	2012-12-21 06:38:52.000000000 -0800
+++ ganeti-2.6.2.new/test/ganeti.utils.process_unittest.py	2012-12-23 22:30:09.278373262 -0800
@@ -340,10 +340,10 @@
   def testResetEnv(self):
     """Test environment reset functionality"""
     self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True).stdout.strip(),
-                         "")
+                         "LD_PRELOAD=libsandbox.so")
     self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True,
                                       env={"FOO": "bar",}).stdout.strip(),
-                         "FOO=bar")
+                         "LD_PRELOAD=libsandbox.so\nFOO=bar")
 
   def testNoFork(self):
     """Test that nofork raise an error"""