diff --git a/CHANGES.md b/CHANGES.md
index 7b7995d..018ef07 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.6.2
+- Fixed custom root directory to allow automated template tests
+
 ## 0.6.1
 - Add support for onfailure for create stack, defaults to DELETE
 
diff --git a/cloudbender/__init__.py b/cloudbender/__init__.py
index e6baf92..71c46d8 100644
--- a/cloudbender/__init__.py
+++ b/cloudbender/__init__.py
@@ -2,7 +2,7 @@ import logging
 
 __author__ = "Stefan Reimer"
 __email__ = "stefan@zero-downtimet.net"
-__version__ = "0.6.1"
+__version__ = "0.6.2"
 
 
 # Set up logging to ``/dev/null`` like a library is supposed to.
diff --git a/cloudbender/cli.py b/cloudbender/cli.py
index c93c1d2..0d8df5a 100644
--- a/cloudbender/cli.py
+++ b/cloudbender/cli.py
@@ -20,8 +20,15 @@ logger = logging.getLogger(__name__)
 def cli(ctx, debug, directory):
     setup_logging(debug)
 
+    # Make sure our root is abs
+    if directory:
+        if not os.path.isabs(directory):
+            directory = os.path.normpath(os.path.join(os.getcwd(), directory))
+    else:
+        directory = os.getcwd()
+
     # Read global config
-    cb = CloudBender(directory if directory else os.getcwd())
+    cb = CloudBender(directory)
     cb.read_config()
     cb.dump_config()
 
diff --git a/cloudbender/core.py b/cloudbender/core.py
index f10d8f5..a1b3ef9 100644
--- a/cloudbender/core.py
+++ b/cloudbender/core.py
@@ -21,7 +21,7 @@ class CloudBender(object):
             "artifact_paths": [os.path.join(self.root, "artifacts")]
         }
 
-        if not os.path.isdir(self.root):
+        if not os.path.isdir(self.ctx['config_path']):
             raise "Check '{0}' exists and is a valid project folder.".format(root_path)
 
     def read_config(self):