diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 68656cbd8a..d459a8dbc9 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -76,9 +76,8 @@ 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
+        # Install the tests
+        make -C tests/kolainst install
       """)
     }
     fcosKola(cosaDir: "${env.WORKSPACE}")
diff --git a/tests/kola/Makefile b/tests/kolainst/Makefile
similarity index 100%
rename from tests/kola/Makefile
rename to tests/kolainst/Makefile
diff --git a/tests/kola/README.md b/tests/kolainst/README.md
similarity index 100%
rename from tests/kola/README.md
rename to tests/kolainst/README.md
diff --git a/tests/kola/destructive/data b/tests/kolainst/destructive/data
similarity index 100%
rename from tests/kola/destructive/data
rename to tests/kolainst/destructive/data
diff --git a/tests/kola/destructive/itest-bare-root.sh b/tests/kolainst/destructive/itest-bare-root.sh
similarity index 100%
rename from tests/kola/destructive/itest-bare-root.sh
rename to tests/kolainst/destructive/itest-bare-root.sh
diff --git a/tests/kola/destructive/itest-deploy-selinux.sh b/tests/kolainst/destructive/itest-deploy-selinux.sh
similarity index 100%
rename from tests/kola/destructive/itest-deploy-selinux.sh
rename to tests/kolainst/destructive/itest-deploy-selinux.sh
diff --git a/tests/kola/destructive/itest-label-selinux.sh b/tests/kolainst/destructive/itest-label-selinux.sh
similarity index 100%
rename from tests/kola/destructive/itest-label-selinux.sh
rename to tests/kolainst/destructive/itest-label-selinux.sh
diff --git a/tests/kola/destructive/staged-delay.sh b/tests/kolainst/destructive/staged-delay.sh
similarity index 100%
rename from tests/kola/destructive/staged-delay.sh
rename to tests/kolainst/destructive/staged-delay.sh
diff --git a/tests/kola/destructive/staged-deploy.sh b/tests/kolainst/destructive/staged-deploy.sh
similarity index 100%
rename from tests/kola/destructive/staged-deploy.sh
rename to tests/kolainst/destructive/staged-deploy.sh
diff --git a/tests/kola/destructive/var-mount.sh b/tests/kolainst/destructive/var-mount.sh
similarity index 100%
rename from tests/kola/destructive/var-mount.sh
rename to tests/kolainst/destructive/var-mount.sh
diff --git a/tests/kola/libinsttest.sh b/tests/kolainst/libinsttest.sh
similarity index 100%
rename from tests/kola/libinsttest.sh
rename to tests/kolainst/libinsttest.sh
diff --git a/tests/kola/libtest-core.sh b/tests/kolainst/libtest-core.sh
similarity index 100%
rename from tests/kola/libtest-core.sh
rename to tests/kolainst/libtest-core.sh
diff --git a/tests/kola/nondestructive/data b/tests/kolainst/nondestructive/data
similarity index 100%
rename from tests/kola/nondestructive/data
rename to tests/kolainst/nondestructive/data
diff --git a/tests/kola/nondestructive/itest-bare-unit.sh b/tests/kolainst/nondestructive/itest-bare-unit.sh
similarity index 100%
rename from tests/kola/nondestructive/itest-bare-unit.sh
rename to tests/kolainst/nondestructive/itest-bare-unit.sh
diff --git a/tests/kola/nondestructive/itest-bare-user-root.sh b/tests/kolainst/nondestructive/itest-bare-user-root.sh
similarity index 100%
rename from tests/kola/nondestructive/itest-bare-user-root.sh
rename to tests/kolainst/nondestructive/itest-bare-user-root.sh
diff --git a/tests/kola/nondestructive/itest-bareuser-nouserxattrs.sh b/tests/kolainst/nondestructive/itest-bareuser-nouserxattrs.sh
similarity index 100%
rename from tests/kola/nondestructive/itest-bareuser-nouserxattrs.sh
rename to tests/kolainst/nondestructive/itest-bareuser-nouserxattrs.sh
diff --git a/tests/kola/nondestructive/itest-payload-link.sh b/tests/kolainst/nondestructive/itest-payload-link.sh
similarity index 100%
rename from tests/kola/nondestructive/itest-payload-link.sh
rename to tests/kolainst/nondestructive/itest-payload-link.sh
diff --git a/tests/kola/nondestructive/itest-pull-space.sh b/tests/kolainst/nondestructive/itest-pull-space.sh
similarity index 100%
rename from tests/kola/nondestructive/itest-pull-space.sh
rename to tests/kolainst/nondestructive/itest-pull-space.sh
diff --git a/tests/kola/nondestructive/itest-pull.sh b/tests/kolainst/nondestructive/itest-pull.sh
similarity index 100%
rename from tests/kola/nondestructive/itest-pull.sh
rename to tests/kolainst/nondestructive/itest-pull.sh
diff --git a/tests/kola/nondestructive/itest-remotes.sh b/tests/kolainst/nondestructive/itest-remotes.sh
similarity index 100%
rename from tests/kola/nondestructive/itest-remotes.sh
rename to tests/kolainst/nondestructive/itest-remotes.sh
diff --git a/tests/kola/nondestructive/libtest-core.sh b/tests/kolainst/nondestructive/libtest-core.sh
similarity index 100%
rename from tests/kola/nondestructive/libtest-core.sh
rename to tests/kolainst/nondestructive/libtest-core.sh
diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh
index 11131fcadc..3c18188009 120000
--- a/tests/libtest-core.sh
+++ b/tests/libtest-core.sh
@@ -1 +1 @@
-kola/libtest-core.sh
\ No newline at end of file
+kolainst/libtest-core.sh
\ No newline at end of file