29 files changed, 9 insertions, 9 deletions
diff --git a/samples/bluetooth/beacon/Makefile b/samples/bluetooth/beacon/Makefile
index fdc0101e3..01f9c3088 100644
--- a/samples/bluetooth/beacon/Makefile
+++ b/samples/bluetooth/beacon/Makefile
@@ -1,7 +1,7 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE ?= prj.conf
+CONF_FILE = prj.conf
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/bluetooth/beacon/testcase.ini b/samples/bluetooth/beacon/testcase.ini
index 53b82525e..98d06cdc6 100644
--- a/samples/bluetooth/beacon/testcase.ini
+++ b/samples/bluetooth/beacon/testcase.ini
@@ -16,5 +16,4 @@ tags = bluetooth
 build_only = true
 extra_args = CONF_FILE="prj_nble.conf"
 arch_whitelist = x86
-config_whitelist = CONFIG_SOC_QUARK_SE
 platform_whitelist = arduino_101
diff --git a/samples/bluetooth/peripheral_sc_only/Makefile b/samples/bluetooth/peripheral_sc_only/Makefile
index 01f9c3088..fdc0101e3 100644
--- a/samples/bluetooth/peripheral_sc_only/Makefile
+++ b/samples/bluetooth/peripheral_sc_only/Makefile
@@ -1,7 +1,7 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj.conf
+CONF_FILE ?= prj.conf
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/bluetooth/shell/testcase.ini b/samples/bluetooth/shell/testcase.ini
index 98d06cdc6..53b82525e 100644
--- a/samples/bluetooth/shell/testcase.ini
+++ b/samples/bluetooth/shell/testcase.ini
@@ -16,4 +16,5 @@ tags = bluetooth
 build_only = true
 extra_args = CONF_FILE="prj_nble.conf"
 arch_whitelist = x86
+config_whitelist = CONFIG_SOC_QUARK_SE
 platform_whitelist = arduino_101
diff --git a/samples/nanokernel/test/test_bluetooth/testcase.ini b/samples/nanokernel/test/test_bluetooth/testcase.ini
deleted file mode 100644
index 8b8817f45..000000000
--- a/samples/nanokernel/test/test_bluetooth/testcase.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[test-bluetooth]
-tags = bluetooth
-arch_whitelist = x86 arm
-platform_whitelist = minnowboard basic_minuteia arduino_101 cortex_m3 frdm_k64f
diff --git a/samples/microkernel/test/test_bluetooth/Makefile b/tests/bluetooth/test_bluetooth/microkernel/Makefile
index 4f982bb26..552689304 100644
--- a/samples/microkernel/test/test_bluetooth/Makefile
+++ b/tests/bluetooth/test_bluetooth/microkernel/Makefile
@@ -2,6 +2,5 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/test_bluetooth/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_bluetooth/prj.mdef b/tests/bluetooth/test_bluetooth/microkernel/prj.mdef
index a3ad4a5e6..a3ad4a5e6 100644
--- a/samples/microkernel/test/test_bluetooth/prj.mdef
+++ b/tests/bluetooth/test_bluetooth/microkernel/prj.mdef
diff --git a/samples/microkernel/test/test_bluetooth/prj_arm.conf b/tests/bluetooth/test_bluetooth/microkernel/prj_arm.conf
index 67e07cfcf..67e07cfcf 100644
--- a/samples/microkernel/test/test_bluetooth/prj_arm.conf
+++ b/tests/bluetooth/test_bluetooth/microkernel/prj_arm.conf
diff --git a/samples/microkernel/test/test_bluetooth/prj_x86.conf b/tests/bluetooth/test_bluetooth/microkernel/prj_x86.conf
index 67e07cfcf..67e07cfcf 100644
--- a/samples/microkernel/test/test_bluetooth/prj_x86.conf
+++ b/tests/bluetooth/test_bluetooth/microkernel/prj_x86.conf
diff --git a/samples/bluetooth/test_bluetooth/Makefile b/tests/bluetooth/test_bluetooth/microkernel/src/Makefile
index da8e477a0..da8e477a0 100644
--- a/samples/bluetooth/test_bluetooth/Makefile
+++ b/tests/bluetooth/test_bluetooth/microkernel/src/Makefile
diff --git a/samples/bluetooth/test_bluetooth/bluetooth.c b/tests/bluetooth/test_bluetooth/microkernel/src/bluetooth.c
index 555716bc7..555716bc7 100644
--- a/samples/bluetooth/test_bluetooth/bluetooth.c
+++ b/tests/bluetooth/test_bluetooth/microkernel/src/bluetooth.c
diff --git a/samples/microkernel/test/test_bluetooth/testcase.ini b/tests/bluetooth/test_bluetooth/microkernel/testcase.ini
index ee3f7b9a0..ee3f7b9a0 100644
--- a/samples/microkernel/test/test_bluetooth/testcase.ini
+++ b/tests/bluetooth/test_bluetooth/microkernel/testcase.ini
diff --git a/samples/nanokernel/test/test_bluetooth/Makefile b/tests/bluetooth/test_bluetooth/nanokernel/Makefile
index 4c22b722d..a7c2f46e7 100644
--- a/samples/nanokernel/test/test_bluetooth/Makefile
+++ b/tests/bluetooth/test_bluetooth/nanokernel/Makefile
@@ -1,6 +1,6 @@
 KERNEL_TYPE = nano
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/test_bluetooth/
+SOURCE_DIR = $(ZEPHYR_BASE)/tests/bluetooth/test_bluetooth/microkernel/src/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/nanokernel/test/test_bluetooth/prj_arm.conf b/tests/bluetooth/test_bluetooth/nanokernel/prj_arm.conf
index 67e07cfcf..67e07cfcf 100644
--- a/samples/nanokernel/test/test_bluetooth/prj_arm.conf
+++ b/tests/bluetooth/test_bluetooth/nanokernel/prj_arm.conf
diff --git a/samples/nanokernel/test/test_bluetooth/prj_x86.conf b/tests/bluetooth/test_bluetooth/nanokernel/prj_x86.conf
index 67e07cfcf..67e07cfcf 100644
--- a/samples/nanokernel/test/test_bluetooth/prj_x86.conf
+++ b/tests/bluetooth/test_bluetooth/nanokernel/prj_x86.conf
diff --git a/tests/bluetooth/test_bluetooth/nanokernel/testcase.ini b/tests/bluetooth/test_bluetooth/nanokernel/testcase.ini
new file mode 100644
index 000000000..42cfab497
--- /dev/null
+++ b/tests/bluetooth/test_bluetooth/nanokernel/testcase.ini
@@ -0,0 +1,5 @@
+[test-bluetooth]
+tags = bluetooth
+arch_whitelist = x86 arm
+platform_whitelist = minnowboard basic_minuteia quark_se cortex_m3  frdm_k64f
+
diff --git a/samples/bluetooth/tester/Makefile b/tests/bluetooth/tester/Makefile
index 1ca5ccf23..1ca5ccf23 100644
--- a/samples/bluetooth/tester/Makefile
+++ b/tests/bluetooth/tester/Makefile
diff --git a/samples/bluetooth/tester/README b/tests/bluetooth/tester/README
index a3a1296ce..a3a1296ce 100644
--- a/samples/bluetooth/tester/README
+++ b/tests/bluetooth/tester/README
diff --git a/samples/bluetooth/tester/btp_spec.txt b/tests/bluetooth/tester/btp_spec.txt
index 731cf709b..731cf709b 100644
--- a/samples/bluetooth/tester/btp_spec.txt
+++ b/tests/bluetooth/tester/btp_spec.txt
diff --git a/samples/bluetooth/tester/prj.conf b/tests/bluetooth/tester/prj.conf
index 617e07ccc..617e07ccc 100644
--- a/samples/bluetooth/tester/prj.conf
+++ b/tests/bluetooth/tester/prj.conf
diff --git a/samples/bluetooth/tester/prj.mdef b/tests/bluetooth/tester/prj.mdef
index dd08b4bd3..dd08b4bd3 100644
--- a/samples/bluetooth/tester/prj.mdef
+++ b/tests/bluetooth/tester/prj.mdef
diff --git a/samples/bluetooth/tester/prj_nble.conf b/tests/bluetooth/tester/prj_nble.conf
index 03112f7a4..03112f7a4 100644
--- a/samples/bluetooth/tester/prj_nble.conf
+++ b/tests/bluetooth/tester/prj_nble.conf
diff --git a/samples/bluetooth/tester/src/Makefile b/tests/bluetooth/tester/src/Makefile
index 5640f877a..5640f877a 100644
--- a/samples/bluetooth/tester/src/Makefile
+++ b/tests/bluetooth/tester/src/Makefile
diff --git a/samples/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c
index de4d5aaec..de4d5aaec 100644
--- a/samples/bluetooth/tester/src/bttester.c
+++ b/tests/bluetooth/tester/src/bttester.c
diff --git a/samples/bluetooth/tester/src/bttester.h b/tests/bluetooth/tester/src/bttester.h
index 89815b9a3..89815b9a3 100644
--- a/samples/bluetooth/tester/src/bttester.h
+++ b/tests/bluetooth/tester/src/bttester.h
diff --git a/samples/bluetooth/tester/src/gap.c b/tests/bluetooth/tester/src/gap.c
index ae4bb7c97..ae4bb7c97 100644
--- a/samples/bluetooth/tester/src/gap.c
+++ b/tests/bluetooth/tester/src/gap.c
diff --git a/samples/bluetooth/tester/src/gatt.c b/tests/bluetooth/tester/src/gatt.c
index 35f743403..35f743403 100644
--- a/samples/bluetooth/tester/src/gatt.c
+++ b/tests/bluetooth/tester/src/gatt.c
diff --git a/samples/bluetooth/tester/src/main.c b/tests/bluetooth/tester/src/main.c
index 1488c642c..1488c642c 100644
--- a/samples/bluetooth/tester/src/main.c
+++ b/tests/bluetooth/tester/src/main.c
diff --git a/samples/bluetooth/tester/testcase.ini b/tests/bluetooth/tester/testcase.ini
index 840b944c3..840b944c3 100644
--- a/samples/bluetooth/tester/testcase.ini
+++ b/tests/bluetooth/tester/testcase.ini