diff --git a/components/freertos/test_apps/freertos/port/test_spinlocks.c b/components/freertos/test_apps/freertos/port/test_spinlocks.c
index dc073b8982..f5ab39788d 100644
--- a/components/freertos/test_apps/freertos/port/test_spinlocks.c
+++ b/components/freertos/test_apps/freertos/port/test_spinlocks.c
@@ -20,6 +20,8 @@
 
 #include "test_utils.h"
 
+#if !CONFIG_FREERTOS_SMP    // Known issue in Amazon SMP FreeRTOS port IDF-6204
+
 #define REPEAT_OPS 10000
 
 static uint32_t start, end;
@@ -162,3 +164,5 @@ TEST_CASE("portMUX high contention, PSRAM", "[freertos]")
 #endif// CONFIG_SPIRAM_USE_MALLOC || CONFIG_SPIRAM_USE_CAPS_ALLOC
 
 #endif // portNUM_PROCESSORS == 2
+
+#endif // !CONFIG_FREERTOS_SMP
diff --git a/components/freertos/test_apps/freertos/pytest_freertos.py b/components/freertos/test_apps/freertos/pytest_freertos.py
index 8ce75fb490..6da2ef98d7 100644
--- a/components/freertos/test_apps/freertos/pytest_freertos.py
+++ b/components/freertos/test_apps/freertos/pytest_freertos.py
@@ -10,6 +10,7 @@ CONFIGS = [
     pytest.param('psram', marks=[pytest.mark.esp32]),
     pytest.param('release', marks=[pytest.mark.supported_targets]),
     pytest.param('single_core', marks=[pytest.mark.esp32]),
+    pytest.param('smp', marks=[pytest.mark.supported_targets]),
 ]
 
 
diff --git a/components/freertos/test_apps/freertos/sdkconfig.ci.smp b/components/freertos/test_apps/freertos/sdkconfig.ci.smp
new file mode 100644
index 0000000000..6be321f712
--- /dev/null
+++ b/components/freertos/test_apps/freertos/sdkconfig.ci.smp
@@ -0,0 +1,3 @@
+# Test configuration for enabling Amazon SMP FreeRTOS, and any optional feature currently supported on it.
+
+CONFIG_FREERTOS_SMP=y