diff --git a/test/check-cli b/test/check-cli
index 196927c8..5c4de56a 100755
--- a/test/check-cli
+++ b/test/check-cli
@@ -1,5 +1,7 @@
 #!/usr/bin/python3
 
+import unittest
+
 import tempfile
 
 import composertest
@@ -21,13 +23,16 @@ class TestImages(composertest.ComposerTestCase):
     def test_compose_sanity(self):
         self.runCliTest("/tests/cli/test_compose_sanity.sh")
 
+    @unittest.skip("Image building is now tested by osbuild-composer test suite")
     def test_ext4_filesystem(self):
         self.runCliTest("/tests/cli/test_compose_ext4-filesystem.sh")
 
+    @unittest.skip("Image building is now tested by osbuild-composer test suite")
     def test_partitioned_disk(self):
         self.runCliTest("/tests/cli/test_compose_partitioned-disk.sh")
 
 
+@unittest.skip("Image building is now tested by osbuild-composer test suite")
 class TestQcow2(composertest.ComposerTestCase):
     def tearDown(self):
         super().tearDownTestMachine()
@@ -53,6 +58,7 @@ class TestQcow2(composertest.ComposerTestCase):
             self.runImageTest("/tests/cli/test_boot_qcow2.sh")
 
 
+@unittest.skip("Image building is now tested by osbuild-composer test suite")
 class TestLiveIso(composertest.ComposerTestCase):
     def tearDown(self):
         super().tearDownTestMachine()
@@ -74,11 +80,13 @@ class TestLiveIso(composertest.ComposerTestCase):
             self.runImageTest("/tests/cli/test_boot_live-iso.sh")
 
 
+@unittest.skip("Image building is now tested by osbuild-composer test suite")
 class TestRepos(composertest.ComposerTestCase):
     def test_repos_sanity(self):
         self.runCliTest("/tests/cli/test_repos_sanity.sh")
 
 
+@unittest.skip("Image building is now tested by osbuild-composer test suite")
 class TestTar(composertest.ComposerTestCase):
     def test_tar(self):
         self.runCliTest("/tests/cli/test_compose_tar.sh")
diff --git a/test/check-cloud b/test/check-cloud
index d7e538d1..5c129b6a 100755
--- a/test/check-cloud
+++ b/test/check-cloud
@@ -1,8 +1,11 @@
 #!/usr/bin/python3
 
+import unittest
+
 import composertest
 
 
+@unittest.skip("Image building is now tested by osbuild-composer test suite")
 class TestCloud(composertest.ComposerTestCase):
     def test_alibaba(self):
         self.runCliTest("/tests/cli/test_compose_alibaba.sh")
diff --git a/test/run b/test/run
index f6f17e56..9addef0d 100755
--- a/test/run
+++ b/test/run
@@ -5,18 +5,9 @@
 make vm
 
 if [ -n "$TEST_SCENARIO" ]; then
-  if [ "$TEST_SCENARIO" == "live-iso" ]; then
-    test/check-cli TestLiveIso
-  elif [ "$TEST_SCENARIO" == "qcow2" ]; then
-    test/check-cli TestQcow2
-  elif [ "$TEST_SCENARIO" == "tar" ]; then
-    test/check-cli TestTar
-  elif [ "$TEST_SCENARIO" == "ci" ]; then
+  if [ "$TEST_SCENARIO" == "ci" ]; then
 	test/check-cli TestPylint 
-  else
-    test/check-cloud TestCloud.test_$TEST_SCENARIO
   fi
 else
   test/check-cli TestImages
-  test/check-cli TestRepos
 fi