diff --git a/tests/run-test.sh b/tests/run-test.sh
index 6c32810..6c5da00 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -20,11 +20,6 @@ fi
 cd "$SOURCE"
 git clone --depth=1 https://github.com/cockpit-project/bots
 
-if [ -n "$test_optional" ]; then
-    # pre-download cirros image for Machines tests
-    bots/image-download cirros
-fi
-
 # only install a subset to save time/space
 npm install axe-core chrome-remote-interface sizzle
 
@@ -39,6 +34,9 @@ fi
 TESTS=""
 RC=0
 if [ -n "$test_optional" ]; then
+    # pre-download cirros image for Machines tests
+    bots/image-download cirros
+
     # some tests are still too unstable: testCreate,testNetworkSettings,testVmNICs
     # testAddDisk triggers SELinux violation
     TESTS="$TESTS
@@ -50,16 +48,8 @@ if [ -n "$test_optional" ]; then
     # not all classes are nondestructive, and we can't run rebooting tests
     TESTS="$TESTS
          TestUpdates.test{Basic,SecurityOnly}
-         TestAutoUpdates"
-
-    # FIXME: storage test classes are all called TestStorage, doesn't work with run-tests selection
-    for t in storage-basic \
-             storage-ignored \
-             storage-partitions \
-             storage-used \
-             storage-lvm2; do
-        test/verify/check-$t -tv --machine localhost:22 --browser localhost:9090 || RC=$?
-    done
+         TestAutoUpdates
+         TestStorage"
 fi
 
 if [ -n "$test_basic" ]; then