diff --git a/tests/run-test.sh b/tests/run-test.sh
index dced5b6..bccf29a 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -32,41 +32,52 @@ if [ "$TEST_OS" = "fedora-33" ]; then
     export TEST_OS=fedora-32
 fi
 
-RC=0
 
+# select tests
+TESTS=""
+RC=0
 if [ -n "$test_optional" ]; then
     # some tests are still too unstable: testCreate,testNetworkSettings,testVmNICs
     # testAddDisk triggers SELinux violation
-    test/verify/check-machines -tv --machine localhost:22 --browser localhost:9090 \
-        TestMachines.test{Basic,VCPU,MultipleSettings,BootOrder,Libvirt} \
-        TestMachines.testDetachDisk \
-        TestMachines.test{InlineConsole,ExternalConsole,SerialConsole} \
-        TestMachines.test{StoragePools,StoragePoolsCreate,NICAdd} || RC=$?
+    TESTS="$TESTS
+        TestMachines.test{Basic,VCPU,MultipleSettings,BootOrder,Libvirt}
+        TestMachines.testDetachDisk
+        TestMachines.test{InlineConsole,ExternalConsole,SerialConsole}
+        TestMachines.test{StoragePools,StoragePoolsCreate,NICAdd}"
 
     # not all classes are nondestructive, and we can't run rebooting tests
-    test/verify/check-packagekit -tv --machine localhost:22 --browser localhost:9090 TestUpdates.test{Basic,SecurityOnly} TestAutoUpdates || RC=$?
+    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
+             storage-used \
+             storage-lvm2; do
         test/verify/check-$t -tv --machine localhost:22 --browser localhost:9090 || RC=$?
     done
 fi
 
 if [ -n "$test_basic" ]; then
     # TestFirewall.testNetworkingPage is still too unstable
-    test/verify/check-networking-firewall -tv --machine localhost:22 --browser localhost:9090 \
-        TestFirewall.test{AddCustomServices,AddServices,FirewallPage,MultipleZones} || RC=$?
+    TESTS="$TESTS TestFirewall.test{AddCustomServices,AddServices,FirewallPage,MultipleZones}"
 
-    # check-menu is not @nondestructive yet, keep it last
-    for t in accounts \
-             login \
-             networking-basic \
-             sosreport \
-             menu; do
-        test/verify/check-$t -tv --machine localhost:22 --browser localhost:9090 || RC=$?
-    done
+    TESTS="$TESTS
+        TestAccounts
+        TestLogin
+        TestNetworking
+        TestSOS"
+fi
+
+# execute run-tests
+test/common/run-tests --test-dir test/verify --trace --verbose --nondestructive \
+    --machine localhost:22 --browser localhost:9090 $TESTS || RC=$?
+
+# check-menu is not @nondestructive yet, keep it last
+if [ -n "$test_basic" ]; then
+    test/verify/check-menu -tv --machine localhost:22 --browser localhost:9090 || RC=$?
 fi
 
 echo $RC > "$LOGS/exitcode"