diff --git a/external/openglcts/modules/gl/gl4cGlSpirvTests.cpp b/external/openglcts/modules/gl/gl4cGlSpirvTests.cpp
index 678bb7230e..d62faa802e 100644
--- a/external/openglcts/modules/gl/gl4cGlSpirvTests.cpp
+++ b/external/openglcts/modules/gl/gl4cGlSpirvTests.cpp
@@ -3030,6 +3030,8 @@ SpirvValidationCapabilitiesTest::SpirvValidationCapabilitiesTest(deqp::Context&
 /** Stub init method */
 void SpirvValidationCapabilitiesTest::init()
 {
+	spirvUtils::checkGlSpirvSupported(m_context);
+	
 	ShaderStage computeStage;
 	computeStage.source = ComputeSource("#version 450\n"
 										"\n"
diff --git a/external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp b/external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp
index c2f90ab25e..6d63b94c43 100644
--- a/external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp
+++ b/external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp
@@ -7734,7 +7734,9 @@ void InteractionInterfaceArrays1<API>::test_shader_compilation(
 		std::string source = invalid_buffer_shader_source;
 
 		DEFAULT_MAIN_ENDING(tested_shader_type, source);
-
+		
+        this->limit_active_shader_storage_block_number(tested_shader_type, 4);
+		
 		EXECUTE_SHADER_TEST(API::ALLOW_A_OF_A_ON_INTERFACE_BLOCKS, tested_shader_type, source);
 	}
 }