RIOT-OS · MrKevinWeiss · May 10, 2021 · May 10, 2021
diff --git a/tests/Makefile.tests_common b/tests/Makefile.tests_common
@@ -25,13 +25,12 @@ DEVELHELP ?= 1
 # expose extra metadata
 CFLAGS += -DRIOT_APPLICATION=\"$(APPLICATION)\"
 
-# Add the common folder for all common test helpers
-EXTERNAL_MODULE_DIRS += $(TESTBASE)/utils/common
-EXTERNAL_MODULE_DIRS += $(TESTBASE)/utils/sc_args
-
 # All tests here _should_ use the test helpers
 USEMODULE += test_helpers
 USEMODULE += sc_args
 
+# Add the common folder for all common test helpers
+EXTERNAL_MODULE_DIRS += $(TESTBASE)/utils
+
 # include RF specific settings
 include $(TESTBASE)/dist/robotframework/Makefile.include
diff --git a/utils/common/Makefile.include b/utils/common/Makefile.include
diff --git a/utils/common/Makefile → utils/test_helpers/Makefile b/utils/common/Makefile → utils/test_helpers/Makefile
diff --git a/utils/test_helpers/Makefile.include b/utils/test_helpers/Makefile.include
@@ -0,0 +1,7 @@
+# Use an immediate variable to evaluate `MAKEFILE_LIST` now
+USEMODULE_INCLUDES_test_helpers := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))/include
+USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_test_helpers)
+
+ifeq ($(USE_JSON_SHELL_PARSER),1)
+  CFLAGS += -DJSON_SHELL_PARSER
+endif
diff --git a/utils/common/include/test_helpers.h → utils/test_helpers/include/test_helpers.h b/utils/common/include/test_helpers.h → utils/test_helpers/include/test_helpers.h
diff --git a/utils/common/test_helpers.c → utils/test_helpers/test_helpers.c b/utils/common/test_helpers.c → utils/test_helpers/test_helpers.c