diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index d1f2a231..68656cbd 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -76,6 +76,9 @@ parallel fcos: {
         rmdir insttree
         coreos-assembler fetch
         coreos-assembler build
+        # Install the tests, then be sure they're not run again
+        make -C tests/kola install
+        rm tests/kola -rf
       """)
     }
     fcosKola(cosaDir: "${env.WORKSPACE}")
diff --git a/Makefile-tests.am b/Makefile-tests.am
index a172f015..411c5628 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -456,3 +456,10 @@ else
 endif
 INSTALL_DATA_HOOKS += install-installed-tests-extra
 endif
+
+# Just forward these
+build-kola-tests:
+	$(MAKE) -C tests/kola
+
+install-kola-tests:
+	$(MAKE) -C tests/kola install
diff --git a/tests/kola/Makefile b/tests/kola/Makefile
new file mode 100644
index 00000000..18305a2f
--- /dev/null
+++ b/tests/kola/Makefile
@@ -0,0 +1,13 @@
+DESTDIR ?=
+
+TESTDIRS := $(shell find -mindepth 1 -maxdepth 1 -type d)
+LIBSCRIPTS := $(shell ls *.sh)
+
+KOLA_TESTDIR = $(DESTDIR)/usr/lib/coreos-assembler/tests/kola/ostree/
+
+all:
+	for x in $(LIBSCRIPTS); do bash -n "$${x}"; done
+
+install:
+	install -D -m 0644 -t $(KOLA_TESTDIR) $(LIBSCRIPTS)
+	for x in $(TESTDIRS); do rsync -rlv ./$${x} $(KOLA_TESTDIR)/; done