diff --git a/scripts/generate_psa_tests.py b/scripts/generate_psa_tests.py
index caf239477..ee2d8e7ea 100755
--- a/scripts/generate_psa_tests.py
+++ b/scripts/generate_psa_tests.py
@@ -356,10 +356,14 @@ class OpFail:
         algorithms = [crypto_knowledge.Algorithm(alg)
                       for alg in self.constructors.generate_expressions(
                           algorithm_constructors)]
-        categories = [
-            cat for cat in crypto_knowledge.AlgorithmCategory
-            if cat != crypto_knowledge.AlgorithmCategory.PAKE # not implemented yet
-        ]
+        supported_categories = set()
+        for alg in algorithms:
+            supported_categories.add(alg.category)
+        # We don't have a pake_fail test function yet.
+        # https://github.com/Mbed-TLS/mbedtls-framework/issues/263
+        supported_categories.remove(crypto_knowledge.AlgorithmCategory.PAKE)
+        categories = sorted(supported_categories, key=lambda cat: cat.value)
+        assert categories # sanity check: at least one category detected
         for alg in algorithms:
             yield from self.test_cases_for_algorithm(alg, categories)