diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index f9750ffee0..9bb50be106 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -76,6 +76,8 @@ parallel insttests: {
         shwrap("ci/installdeps.sh")
       }
       stage("Kola") {
+        // TODO upstream this into coreos-ci-lib
+        shwrap("make -C tests/kolainst install")
         fcosKola(cosaDir: "${env.WORKSPACE}", extraArgs: "ext.*", parallel: nhosts)
       }
       stage("vmcheck") {
diff --git a/tests/kola/nondestructive/data b/tests/kola/nondestructive/data
deleted file mode 120000
index dc879abe93..0000000000
--- a/tests/kola/nondestructive/data
+++ /dev/null
@@ -1 +0,0 @@
-../../common
\ No newline at end of file
diff --git a/tests/kolainst/Makefile b/tests/kolainst/Makefile
new file mode 100644
index 0000000000..267f7193e8
--- /dev/null
+++ b/tests/kolainst/Makefile
@@ -0,0 +1,13 @@
+DESTDIR ?=
+
+TESTDIRS := $(shell find -mindepth 1 -maxdepth 1 -type d)
+
+KOLA_TESTDIR = $(DESTDIR)/usr/lib/coreos-assembler/tests/kola/rpm-ostree/
+
+all:
+	@echo "No build step"
+
+install:
+	install -d -m 0755 $(KOLA_TESTDIR)
+	rsync -prlv ./nondestructive $(KOLA_TESTDIR)/
+	rsync -prlv ../common/ $(KOLA_TESTDIR)/nondestructive/data
diff --git a/tests/kola/nondestructive/misc.sh b/tests/kolainst/nondestructive/misc.sh
similarity index 100%
rename from tests/kola/nondestructive/misc.sh
rename to tests/kolainst/nondestructive/misc.sh