diff --git a/build/tests/build4WLDev/Makefile b/build/tests/build4WLDev/Makefile
index 730f852e..c5464dd4 100644
--- a/build/tests/build4WLDev/Makefile
+++ b/build/tests/build4WLDev/Makefile
@@ -43,6 +43,10 @@ NANDFIRM_DIR                =   $(SYSMENU_ROOT)/build/nandfirm/menu-launcher
 
 SYSTEMUPDATER_DIR			=	$(SYSMENU_ROOT)/build/systemMenu_tools/SystemUpdater
 
+ifdef BUILD_TWLSDK
+SUBMAKES +=	Makefile_environment
+endif
+
 SUBMAKES +=	./scripts/Makefile											\
 			$(SYSMENU_ROOT)/build/tools/Makefile						\
 			$(SYSMENU_ROOT)/build/libraries/Makefile					\
diff --git a/build/tests/build4WLDev/Makefile_environment b/build/tests/build4WLDev/Makefile_environment
index 7a2ab977..f7ce940a 100644
--- a/build/tests/build4WLDev/Makefile_environment
+++ b/build/tests/build4WLDev/Makefile_environment
@@ -27,8 +27,11 @@ include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 export NITRO_WITHOUT_DEMOS			=	TRUE
 export TWL_WITHOUT_DEMOS			=	TRUE
 
-SUBDIRS =	$(TWLSYSTEM_ROOT)		\
-			$(ROOT)					\
+override TWLSYSTEM_ROOT=
+export TWLSYSTEM_ROOT
+
+SUBDIRS =	$(ROOT)					\
+			$(NITROSYSTEM_ROOT)		\
 			
 
 #----------------------------------------------------------------------------