diff --git a/test/mod/test_osbuild.py b/test/mod/test_osbuild.py
index f47ed99e..f502d238 100644
--- a/test/mod/test_osbuild.py
+++ b/test/mod/test_osbuild.py
@@ -282,6 +282,10 @@ class TestDescriptions(unittest.TestCase):
 
             try:
                 info = osbuild.meta.ModuleInfo.load(os.curdir, klass, name)
+                if not info.opts[version]:
+                    print(f"{klass} '{name}' does not support version '{version}'")
+                    continue
+
                 schema = osbuild.meta.Schema(info.get_schema(version), name)
                 res = schema.check()
                 if not res:
@@ -291,6 +295,10 @@ class TestDescriptions(unittest.TestCase):
             except json.decoder.JSONDecodeError as e:
                 msg = f"{klass} '{name}' has invalid STAGE_OPTS\n\t" + str(e)
                 self.fail(msg)
+            # pylint: disable=broad-exception-caught
+            except Exception as e:
+                msg = f"{klass} '{name}': " + str(e)
+                self.fail(msg)
 
     def test_moduleinfo(self):
         for version in ["1", "2"]: