diff --git a/platforms/nexus/kelvin.mk b/platforms/nexus/kelvin.mk
index 473111f..7cd60d1 100644
--- a/platforms/nexus/kelvin.mk
+++ b/platforms/nexus/kelvin.mk
@@ -46,10 +46,10 @@
 
 ## Test Kelvin SW artifacts
 #
-# Test Kelvin SW artifacts with kelvin ISS simulation
-kelvin_sw_test: kelvin_sim | $(KELVIN_SW_TESTLOG_DIR)
+# Test Kelvin SW artifacts with kelvin ISS and SystemC simulations
+kelvin_sw_test: kelvin_sim kelvin_hw_sim | $(KELVIN_SW_TESTLOG_DIR)
 	cd "$(KELVIN_SW_SRC_DIR)" && \
-		bazel test --test_output=errors //... && \
+		bazel test --test_output=errors --test_tag_filters="-broken"  //... && \
 		cp -rf bazel-testlogs/tests "$(KELVIN_SW_TESTLOG_DIR)"
 
 ## Clean Kelvin SW artifacts
diff --git a/platforms/shodan/kelvin.mk b/platforms/shodan/kelvin.mk
index 722be80..bbfe9ff 100644
--- a/platforms/shodan/kelvin.mk
+++ b/platforms/shodan/kelvin.mk
@@ -34,10 +34,10 @@
 
 ## Test Kelvin SW artifacts
 #
-# Test Kelvin SW artifacts with kelvin ISS simulation
-kelvin_sw_test: kelvin_sim | $(KELVIN_SW_TESTLOG_DIR)
+# Test Kelvin SW artifacts with kelvin ISS and SystemC simulations
+kelvin_sw_test: kelvin_sim kelvin_hw_sim | $(KELVIN_SW_TESTLOG_DIR)
 	cd "$(KELVIN_SW_SRC_DIR)" && \
-		bazel test --test_output=errors //... && \
+		bazel test --test_output=errors --test_tag_filters="-broken" //... && \
 		cp -rf bazel-testlogs/tests "$(KELVIN_SW_TESTLOG_DIR)"
 
 ## Clean Kelvin SW artifacts