diff --git a/tests/kola/luks/ignition/config.ign b/tests/kola/luks-var/config.ign
similarity index 100%
rename from tests/kola/luks/ignition/config.ign
rename to tests/kola/luks-var/config.ign
diff --git a/tests/kola/luks/ignition/test.sh b/tests/kola/luks-var/test.sh
similarity index 100%
rename from tests/kola/luks/ignition/test.sh
rename to tests/kola/luks-var/test.sh
diff --git a/tests/kola/luks/tpm/config.ign b/tests/kola/luks/tpm/config.ign
deleted file mode 100644
index 950aa670..00000000
--- a/tests/kola/luks/tpm/config.ign
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "ignition": {
-    "version": "3.2.0"
-  },
-  "storage": {
-    "luks": [
-      {
-        "name": "myluksdev",
-        "device": "/dev/disk/by-partlabel/root",
-        "clevis": {
-          "tpm2": true
-        },
-        "label": "root",
-        "wipeVolume": true
-      }
-    ],
-    "filesystems": [
-      {
-        "device": "/dev/mapper/myluksdev",
-        "format": "xfs",
-        "wipeFilesystem": true,
-        "label": "root"
-      }
-    ]
-  }
-}
diff --git a/tests/kola/luks/tpm/test.sh b/tests/kola/luks/tpm/test.sh
deleted file mode 100755
index ae357437..00000000
--- a/tests/kola/luks/tpm/test.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# kola: {"platforms": "qemu", "minMemory": 4096, "architectures": "!s390x"}
-set -xeuo pipefail
-
-srcdev=$(findmnt -nvr / -o SOURCE)
-[[ ${srcdev} == /dev/mapper/myluksdev ]]
-
-blktype=$(lsblk -o TYPE "${srcdev}" --noheadings)
-[[ ${blktype} == crypt ]]
-
-fstype=$(findmnt -nvr / -o FSTYPE)
-[[ ${fstype} == xfs ]]
-
-case "${AUTOPKGTEST_REBOOT_MARK:-}" in
-  "")
-      # check that growpart didn't run
-      if [ -e /run/coreos-growpart.stamp ]; then
-          echo "coreos-growpart ran"
-          exit 1
-      fi
-
-      # reboot once to sanity-check we can find root on second boot
-      /tmp/autopkgtest-reboot rebooted
-      ;;
-
-  rebooted)
-      grep root=UUID= /proc/cmdline
-      grep rd.luks.name= /proc/cmdline
-      ;;
-  *) echo "unexpected mark: ${AUTOPKGTEST_REBOOT_MARK}"; exit 1;;
-esac
diff --git a/tests/kola/root-reprovision b/tests/kola/root-reprovision
new file mode 120000
index 00000000..f6a0f9ed
--- /dev/null
+++ b/tests/kola/root-reprovision
@@ -0,0 +1 @@
+../../fedora-coreos-config/tests/kola/root-reprovision
\ No newline at end of file