diff --git a/tests/subsys/settings/functional/CMakeLists.txt b/tests/subsys/settings/functional/fcb/CMakeLists.txt
similarity index 92%
rename from tests/subsys/settings/functional/CMakeLists.txt
rename to tests/subsys/settings/functional/fcb/CMakeLists.txt
index fb0087908c8..a9f7b959d23 100644
--- a/tests/subsys/settings/functional/CMakeLists.txt
+++ b/tests/subsys/settings/functional/fcb/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1)
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(NONE)
 
-FILE(GLOB app_sources src/*.c)
+FILE(GLOB app_sources ../src/*.c)
 target_sources(app PRIVATE ${app_sources})
 zephyr_include_directories(
 	$ENV{ZEPHYR_BASE}/subsys/settings/include
diff --git a/tests/subsys/settings/functional/boards/particle_xenon.conf b/tests/subsys/settings/functional/fcb/boards/particle_xenon.conf
similarity index 100%
rename from tests/subsys/settings/functional/boards/particle_xenon.conf
rename to tests/subsys/settings/functional/fcb/boards/particle_xenon.conf
diff --git a/tests/subsys/settings/functional/native_posix.overlay b/tests/subsys/settings/functional/fcb/native_posix.overlay
similarity index 100%
rename from tests/subsys/settings/functional/native_posix.overlay
rename to tests/subsys/settings/functional/fcb/native_posix.overlay
diff --git a/tests/subsys/settings/functional/nrf52840_pca10056.overlay b/tests/subsys/settings/functional/fcb/nrf52840_pca10056.overlay
similarity index 100%
rename from tests/subsys/settings/functional/nrf52840_pca10056.overlay
rename to tests/subsys/settings/functional/fcb/nrf52840_pca10056.overlay
diff --git a/tests/subsys/settings/functional/nrf52_pca10040.overlay b/tests/subsys/settings/functional/fcb/nrf52_pca10040.overlay
similarity index 100%
rename from tests/subsys/settings/functional/nrf52_pca10040.overlay
rename to tests/subsys/settings/functional/fcb/nrf52_pca10040.overlay
diff --git a/tests/subsys/settings/functional/particle_xenon.overlay b/tests/subsys/settings/functional/fcb/particle_xenon.overlay
similarity index 100%
rename from tests/subsys/settings/functional/particle_xenon.overlay
rename to tests/subsys/settings/functional/fcb/particle_xenon.overlay
diff --git a/tests/subsys/settings/functional/prj.conf b/tests/subsys/settings/functional/fcb/prj.conf
similarity index 100%
rename from tests/subsys/settings/functional/prj.conf
rename to tests/subsys/settings/functional/fcb/prj.conf
diff --git a/tests/subsys/settings/functional/prj_native_posix.conf b/tests/subsys/settings/functional/fcb/prj_native_posix.conf
similarity index 100%
rename from tests/subsys/settings/functional/prj_native_posix.conf
rename to tests/subsys/settings/functional/fcb/prj_native_posix.conf
diff --git a/tests/subsys/settings/functional/prj_native_posix_64.conf b/tests/subsys/settings/functional/fcb/prj_native_posix_64.conf
similarity index 100%
rename from tests/subsys/settings/functional/prj_native_posix_64.conf
rename to tests/subsys/settings/functional/fcb/prj_native_posix_64.conf
diff --git a/tests/subsys/settings/functional/prj_qemu_x86.conf b/tests/subsys/settings/functional/fcb/prj_qemu_x86.conf
similarity index 100%
rename from tests/subsys/settings/functional/prj_qemu_x86.conf
rename to tests/subsys/settings/functional/fcb/prj_qemu_x86.conf
diff --git a/tests/subsys/settings/functional/testcase.yaml b/tests/subsys/settings/functional/fcb/testcase.yaml
similarity index 100%
rename from tests/subsys/settings/functional/testcase.yaml
rename to tests/subsys/settings/functional/fcb/testcase.yaml
diff --git a/tests/subsys/settings/functional/nvs/CMakeLists.txt b/tests/subsys/settings/functional/nvs/CMakeLists.txt
new file mode 100644
index 00000000000..a9f7b959d23
--- /dev/null
+++ b/tests/subsys/settings/functional/nvs/CMakeLists.txt
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.13.1)
+include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
+project(NONE)
+
+FILE(GLOB app_sources ../src/*.c)
+target_sources(app PRIVATE ${app_sources})
+zephyr_include_directories(
+	$ENV{ZEPHYR_BASE}/subsys/settings/include
+	$ENV{ZEPHYR_BASE}/subsys/settings/src
+	)
+
+if(TEST)
+	target_compile_definitions(app PRIVATE
+		-DTEST_${TEST}
+		)
+endif()
diff --git a/tests/subsys/settings/functional/prj_qemu_x86_nvs.conf b/tests/subsys/settings/functional/nvs/prj.conf
similarity index 100%
rename from tests/subsys/settings/functional/prj_qemu_x86_nvs.conf
rename to tests/subsys/settings/functional/nvs/prj.conf
diff --git a/tests/subsys/settings/functional/nvs/prj_qemu_x86.conf b/tests/subsys/settings/functional/nvs/prj_qemu_x86.conf
new file mode 100644
index 00000000000..e829f3c9932
--- /dev/null
+++ b/tests/subsys/settings/functional/nvs/prj_qemu_x86.conf
@@ -0,0 +1,11 @@
+CONFIG_ZTEST=y
+CONFIG_STDOUT_CONSOLE=y
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+CONFIG_NVS=y
+
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_RUNTIME=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_SETTINGS_USE_BASE64=n
diff --git a/tests/subsys/settings/functional/nvs/testcase.yaml b/tests/subsys/settings/functional/nvs/testcase.yaml
new file mode 100644
index 00000000000..0a9fcf34156
--- /dev/null
+++ b/tests/subsys/settings/functional/nvs/testcase.yaml
@@ -0,0 +1,4 @@
+tests:
+  system.settings.nvs:
+    platform_whitelist: qemu_x86
+    tags: settings_nvs