diff --git a/tests/boards/intel_s1000_crb/cache/testcase.yaml b/tests/boards/intel_s1000_crb/cache/testcase.yaml
index afb2188694e..95b4bf0c43d 100644
--- a/tests/boards/intel_s1000_crb/cache/testcase.yaml
+++ b/tests/boards/intel_s1000_crb/cache/testcase.yaml
@@ -1,4 +1,4 @@
 tests:
-  boards.s1000_crb:
+  boards.s1000_crb.cache:
     platform_whitelist: intel_s1000_crb
     tags: boards
diff --git a/tests/boards/intel_s1000_crb/CMakeLists.txt b/tests/boards/intel_s1000_crb/main/CMakeLists.txt
similarity index 100%
rename from tests/boards/intel_s1000_crb/CMakeLists.txt
rename to tests/boards/intel_s1000_crb/main/CMakeLists.txt
diff --git a/tests/boards/intel_s1000_crb/README.txt b/tests/boards/intel_s1000_crb/main/README.txt
similarity index 100%
rename from tests/boards/intel_s1000_crb/README.txt
rename to tests/boards/intel_s1000_crb/main/README.txt
diff --git a/tests/boards/intel_s1000_crb/prj.conf b/tests/boards/intel_s1000_crb/main/prj.conf
similarity index 100%
rename from tests/boards/intel_s1000_crb/prj.conf
rename to tests/boards/intel_s1000_crb/main/prj.conf
diff --git a/tests/boards/intel_s1000_crb/src/dma_test.c b/tests/boards/intel_s1000_crb/main/src/dma_test.c
similarity index 100%
rename from tests/boards/intel_s1000_crb/src/dma_test.c
rename to tests/boards/intel_s1000_crb/main/src/dma_test.c
diff --git a/tests/boards/intel_s1000_crb/src/gpio_test.c b/tests/boards/intel_s1000_crb/main/src/gpio_test.c
similarity index 100%
rename from tests/boards/intel_s1000_crb/src/gpio_test.c
rename to tests/boards/intel_s1000_crb/main/src/gpio_test.c
diff --git a/tests/boards/intel_s1000_crb/src/i2c_test.c b/tests/boards/intel_s1000_crb/main/src/i2c_test.c
similarity index 100%
rename from tests/boards/intel_s1000_crb/src/i2c_test.c
rename to tests/boards/intel_s1000_crb/main/src/i2c_test.c
diff --git a/tests/boards/intel_s1000_crb/src/i2s_test.c b/tests/boards/intel_s1000_crb/main/src/i2s_test.c
similarity index 100%
rename from tests/boards/intel_s1000_crb/src/i2s_test.c
rename to tests/boards/intel_s1000_crb/main/src/i2s_test.c
diff --git a/tests/boards/intel_s1000_crb/src/main.c b/tests/boards/intel_s1000_crb/main/src/main.c
similarity index 100%
rename from tests/boards/intel_s1000_crb/src/main.c
rename to tests/boards/intel_s1000_crb/main/src/main.c
diff --git a/tests/boards/intel_s1000_crb/src/spi_flash.c b/tests/boards/intel_s1000_crb/main/src/spi_flash.c
similarity index 100%
rename from tests/boards/intel_s1000_crb/src/spi_flash.c
rename to tests/boards/intel_s1000_crb/main/src/spi_flash.c
diff --git a/tests/boards/intel_s1000_crb/src/test_hid.c b/tests/boards/intel_s1000_crb/main/src/test_hid.c
similarity index 100%
rename from tests/boards/intel_s1000_crb/src/test_hid.c
rename to tests/boards/intel_s1000_crb/main/src/test_hid.c
diff --git a/tests/boards/intel_s1000_crb/testcase.yaml b/tests/boards/intel_s1000_crb/main/testcase.yaml
similarity index 100%
rename from tests/boards/intel_s1000_crb/testcase.yaml
rename to tests/boards/intel_s1000_crb/main/testcase.yaml