diff --git a/tests/kernel/test_fifo/src/Makefile b/tests/kernel/test_fifo/src/Makefile
index 4d43887717d..a1d95575720 100644
--- a/tests/kernel/test_fifo/src/Makefile
+++ b/tests/kernel/test_fifo/src/Makefile
@@ -1,5 +1,4 @@
 ccflags-y += -I${srctree}/tests/include
-ccflags-$(CONFIG_SOC_QUARK_D2000) += -DFIBER_STACKSIZE=256
 
 obj-$(CONFIG_MICROKERNEL) = micro_fifo.o
 obj-$(CONFIG_NANOKERNEL) = nano_fifo.o fifo_timeout.o
diff --git a/tests/kernel/test_fifo/src/fifo_timeout.c b/tests/kernel/test_fifo/src/fifo_timeout.c
index 32d5aa00d11..263c0630292 100644
--- a/tests/kernel/test_fifo/src/fifo_timeout.c
+++ b/tests/kernel/test_fifo/src/fifo_timeout.c
@@ -38,9 +38,7 @@
 #include <tc_nano_timeout_common.h>
 
 #define FIBER_PRIORITY 5
-#ifndef FIBER_STACKSIZE
-#define FIBER_STACKSIZE 2048
-#endif
+#define FIBER_STACKSIZE 256
 
 struct scratch_fifo_packet {
 	void *link_in_fifo;
diff --git a/tests/kernel/test_fifo/src/nano_fifo.c b/tests/kernel/test_fifo/src/nano_fifo.c
index 21b409014db..ea367c73cbe 100644
--- a/tests/kernel/test_fifo/src/nano_fifo.c
+++ b/tests/kernel/test_fifo/src/nano_fifo.c
@@ -58,11 +58,9 @@
 
 #include <util_test_common.h>
 
-#ifndef FIBER_STACKSIZE
-#define FIBER_STACKSIZE               2048
-#endif
-#define NUM_FIFO_ELEMENT        4
-#define INVALID_DATA            NULL
+#define FIBER_STACKSIZE		256
+#define NUM_FIFO_ELEMENT	4
+#define INVALID_DATA		NULL
 
 #define TCERR1(count)  TC_ERROR("Didn't get back correct FIFO, count %d\n", count)
 #define TCERR2         TC_ERROR("Didn't get back correct FIFO\n")
diff --git a/tests/kernel/test_fifo/testcase.ini b/tests/kernel/test_fifo/testcase.ini
index 114c6af3461..76e1cdcce73 100644
--- a/tests/kernel/test_fifo/testcase.ini
+++ b/tests/kernel/test_fifo/testcase.ini
@@ -7,5 +7,3 @@ kernel = micro
 extra_args = KERNEL_TYPE=nano
 tags = core
 kernel = nano
-# Not enough SRAM to run this test on quark SE
-config_whitelist = !CONFIG_SOC_QUARK_SE_SS