diff --git a/cdist/core/code.py b/cdist/core/code.py
index fa1ed3c1..d5f59094 100644
--- a/cdist/core/code.py
+++ b/cdist/core/code.py
@@ -89,7 +89,7 @@ class Code(object):
         self.remote = remote
         self.env = {
             '__target_host': self.target_host,
-            '__global': self.local.out_path,
+            '__global': self.local.base_path,
         }
 
     def _run_gencode(self, cdist_object, which):
diff --git a/cdist/test/config_install/__init__.py b/cdist/test/config_install/__init__.py
index 4047abe4..a66eaa13 100644
--- a/cdist/test/config_install/__init__.py
+++ b/cdist/test/config_install/__init__.py
@@ -47,11 +47,11 @@ class ConfigInstallRunTestCase(test.CdistTestCase):
         os.environ = os.environ.copy()
         self.temp_dir = self.mkdtemp()
 
-        self.out_dir = os.path.join(self.temp_dir, "out")
-        os.mkdir(self.out_dir)
+        self.local_dir = os.path.join(self.temp_dir, "local")
+        os.mkdir(self.local_dir)
         self.local = cdist.exec.local.Local(
             target_host=self.target_host,
-            out_path=self.out_dir)
+            base_path=self.local_dir)
 
         self.remote_dir = os.path.join(self.temp_dir, "remote")
         os.mkdir(self.remote_dir)