diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml
index 034748353e..60629f6909 100644
--- a/.github/workflows/twister.yaml
+++ b/.github/workflows/twister.yaml
@@ -65,6 +65,7 @@ jobs:
           rm -fr ".git/rebase-apply"
           git rebase origin/${BASE_REF}
           git log  --pretty=oneline | head -n 10
+          west config manifest.group-filter -- +ci
           west init -l . || true
           # no need for west update here
 
diff --git a/modules/fff/CMakeLists.txt b/modules/fff/CMakeLists.txt
index 2c545440c9..a7cbc66175 100644
--- a/modules/fff/CMakeLists.txt
+++ b/modules/fff/CMakeLists.txt
@@ -5,17 +5,17 @@
 
 if(CONFIG_FFF_TEST)
   # Add the FFF C test suites as ztest suites
-  message("CONFIG_FFF_TEST_C=${CONFIG_FFF_TEST_C}")
-  message("CONFIG_FFF_TEST_GLOBAL_C=${CONFIG_FFF_TEST_GLOBAL_C}")
+  message("CONFIG_FFF_TEST_TYPE_C=${CONFIG_FFF_TEST_TYPE_C}")
+  message("CONFIG_FFF_TEST_TYPE_GLOBAL_C=${CONFIG_FFF_TEST_TYPE_GLOBAL_C}")
   zephyr_library()
   zephyr_include_directories(
       include
       "${ZEPHYR_CURRENT_MODULE_DIR}"
       "${ZEPHYR_CURRENT_MODULE_DIR}/test"
   )
-  if(DEFINED CONFIG_FFF_TEST_C)
+  if(DEFINED CONFIG_FFF_TEST_TYPE_C)
     zephyr_library_sources("${ZEPHYR_CURRENT_MODULE_DIR}/test/fff_test_c.c")
-  elseif(DEFINED CONFIG_FFF_TEST_GLOBAL_C)
+  elseif(DEFINED CONFIG_FFF_TEST_TYPE_GLOBAL_C)
     zephyr_library_sources(
         "${ZEPHYR_CURRENT_MODULE_DIR}/test/fff_test_global_c.c"
         "${ZEPHYR_CURRENT_MODULE_DIR}/test/global_fakes.c"
diff --git a/modules/fff/Kconfig b/modules/fff/Kconfig
index 7f41287418..c430b8228d 100644
--- a/modules/fff/Kconfig
+++ b/modules/fff/Kconfig
@@ -4,7 +4,7 @@
 config ZEPHYR_FFF_MODULE
 	bool
 
-config FFF_TEST
+menuconfig FFF_TEST
 	bool "FFF Test suite"
 	help
 	  Enable the FFF test suite. This should really only be called from the tests for FFF under
@@ -12,15 +12,15 @@ config FFF_TEST
 
 if FFF_TEST
 
-choice FFF_TEST
+choice FFF_TEST_TYPE
 	prompt "The type of FFF test to bring in"
 
-config FFF_TEST_C
+config FFF_TEST_TYPE_C
 	bool "Compile the FFF default C test suite as a zephyr library"
 
-config FFF_TEST_GLOBAL_C
+config FFF_TEST_TYPE_GLOBAL_C
 	bool "Compile the FFF global C test suite as a zephyr library"
 
-endchoice # FFF_TEST
+endchoice # FFF_TEST_TYPE
 
 endif # FFF_TEST
diff --git a/tests/ztest/mock_fff/CMakeLists.txt b/tests/ztest/mock_fff/CMakeLists.txt
index f65ef6ba81..5a5540da28 100644
--- a/tests/ztest/mock_fff/CMakeLists.txt
+++ b/tests/ztest/mock_fff/CMakeLists.txt
@@ -2,8 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.20.0)
+
+# Add the Zephyr package and create the project
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(mock_fff)
 
+# Glob the sources and add them to the app
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/tests/ztest/mock_fff/prj.conf b/tests/ztest/mock_fff/prj.conf
index 49bf193f30..5bdc0b41e6 100644
--- a/tests/ztest/mock_fff/prj.conf
+++ b/tests/ztest/mock_fff/prj.conf
@@ -1,3 +1,3 @@
 CONFIG_ZTEST=y
 CONFIG_FFF_TEST=y
-CONFIG_FFF_TEST_C=y
+CONFIG_FFF_TEST_TYPE_C=y
diff --git a/tests/ztest/mock_fff/prj_global.conf b/tests/ztest/mock_fff/prj_global.conf
index a4d6281d09..8f1817d617 100644
--- a/tests/ztest/mock_fff/prj_global.conf
+++ b/tests/ztest/mock_fff/prj_global.conf
@@ -1,3 +1,3 @@
 CONFIG_ZTEST=y
 CONFIG_FFF_TEST=y
-CONFIG_FFF_TEST_GLOBAL_C=y
+CONFIG_FFF_TEST_TYPE_GLOBAL_C=y