diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3aa21c4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tests/sharness"]
+	path = create-install-image/tests/sharness
+	url = https://github.com/felipec/sharness.git
diff --git a/create-install-image/.gitignore b/create-install-image/.gitignore
new file mode 100644
index 0000000..e41395a
--- /dev/null
+++ b/create-install-image/.gitignore
@@ -0,0 +1,3 @@
+/tests/test-results/
+/tests/trash directory.*
+/tests/trash_directory.*
diff --git a/create-install-image/tests/0000-sanity.t b/create-install-image/tests/0000-sanity.t
new file mode 100755
index 0000000..6d38783
--- /dev/null
+++ b/create-install-image/tests/0000-sanity.t
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+test_description="sanity check before running real tests"
+
+DIR0="$(dirname "$0")"
+TESTDIR="$(realpath "$DIR0")"
+. $TESTDIR/sharness/sharness.sh
+
+test_expect_success "verify test environment" "
+    echo \"XCPTEST_REPOROOT=$XCPTEST_REPOROOT\" | grep '://'
+"
+
+test_done
diff --git a/create-install-image/tests/Makefile b/create-install-image/tests/Makefile
new file mode 120000
index 0000000..fef5c61
--- /dev/null
+++ b/create-install-image/tests/Makefile
@@ -0,0 +1 @@
+sharness/example/Makefile
\ No newline at end of file
diff --git a/create-install-image/tests/sharness b/create-install-image/tests/sharness
new file mode 160000
index 0000000..e457513
--- /dev/null
+++ b/create-install-image/tests/sharness
@@ -0,0 +1 @@
+Subproject commit e457513ae8d4912994f2ea5423a9392ee6d03f4b