diff --git a/tests/fedora-str/sysinstall-tests.yml b/tests/fedora-str/sysinstall-tests.yml
index 88b289d4..58f216ae 100644
--- a/tests/fedora-str/sysinstall-tests.yml
+++ b/tests/fedora-str/sysinstall-tests.yml
@@ -6,6 +6,7 @@
   remote_user: root
   vars:
     use_git_build: True
+    tests: ""
   tasks:
     - import_tasks: overlay-git.yml
       when: use_git_build
@@ -15,6 +16,8 @@
     # Down the line perhaps do each log file separately?
     - name: Run shell script sysinstalled tests
       shell: /root/tests/installed/run.sh &> /root/installed-tests.log
+      environment:
+        TESTS: "{{ tests }}"
       register: sysinstalled_result
       failed_when: False
     - name: Fetch sysinstalled results
diff --git a/tests/installed/libinsttest.sh b/tests/installed/libinsttest.sh
index 6d6ba50c..96da9545 100644
--- a/tests/installed/libinsttest.sh
+++ b/tests/installed/libinsttest.sh
@@ -25,7 +25,8 @@ dn=$(dirname $0)
 # Copy of bits from tap-test
 test_tmpdir=
 function _tmpdir_cleanup () {
-    if test -n "${test_tmpdir}" && test -f ${test_tmpdir}/.testtmp; then
+    if test -z "${TEST_SKIP_CLEANUP:-}" &&
+       test -n "${test_tmpdir}" && test -f ${test_tmpdir}/.testtmp; then
 	      rm "${test_tmpdir}" -rf
     fi
 }