diff --git a/test/cdist_tree_wrapper b/test/cdist_tree_wrapper
index fb9cd626..429237ff 100755
--- a/test/cdist_tree_wrapper
+++ b/test/cdist_tree_wrapper
@@ -21,8 +21,17 @@
 # Wrapper script that generates cconfig from arguments
 #
 
-#[ $# -eq 1 ] || __cdist_usage "cconf"
 
 . cdist-config
 
+[ $# -ge 1 ] || __cdist_usage "<id> <options>"
+
 echo "I am $__cdist_myname and have been called with $@"
+
+id="$1"; shift
+
+# FIXME: find a better definiton of sane (i.e. everything that is a valid filename)
+echo "$id" | grep -q '^[A-Za-z0-9]*$' || __cdist_usage "Provide sane id, please"
+
+
+echo mkdir -p "${cdist_confdir}/${__cdist_myname}/${id}"