diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index 28afbfb..b608d7b 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -324,12 +324,14 @@
 		EXPECT(ffa_func_id(ret), FFA_SUCCESS_SMC32);
 	}
 
+#if !SPMC_AT_EL3
 	discover_managed_exit_interrupt_id();
 	register_maintenance_interrupt_handlers();
 
 	/* Invoking self tests */
 	ffa_tests(&mb, true);
 	cpu_feature_tests();
+#endif
 
 msg_loop:
 	/* End up to message loop */