diff --git a/lib/cdist/test/__main__.py b/lib/cdist/test/__main__.py
new file mode 100644
index 00000000..03bca847
--- /dev/null
+++ b/lib/cdist/test/__main__.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+
+import sys
+import cdist.test
+
+#class UI(unittest.TestCase):
+#    def test_banner(self):
+#        self.assertEqual(subprocess.call([cdist_exec_path, "banner"]), 0)
+#
+#    def test_help(self):
+#        for cmd in cdist_commands:
+#            self.assertEqual(subprocess.call([cdist_exec_path, cmd, "-h"]), 0)
+#
+#    # FIXME: mockup needed
+#    def test_config_localhost(self):
+#        for cmd in cdist_commands:
+#            self.assertEqual(subprocess.call([cdist_exec_path, "config", "localhost"]), 0)
+
+print(cdist.test.cdist_exec_path)
+print(sys.argv)