diff --git a/apps/Makefile b/apps/Makefile
index 059d8cc7..62bf6904 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -18,6 +18,15 @@ include $(COREPATH)/../Makefile.defs
 #   
 
 ifeq ($(app_modules),)
+
+ ifeq ($(exclude_app_modules),)
+  exclude_app_modules = ann_b2b announce_transfer announcement annrecorder callback callqueues conference confpin conf_auth diameter_client dimanagedha early_announce early_dbprompt examples examples/tutorial/cc_acc gateway ivr jsonrpc mailbox memcachedstore mobile_push mp3 msg_storage mwi pin_collect precoded_announce py_sems rtmp twit voicebox voicemail webconference
+ endif
+
+ ifeq ($(TEST_ENVIRONMENT),yes)
+  exclude_app_modules = ann_b2b announce_transfer announcement annrecorder callback callqueues conference confpin conf_auth diameter_client dimanagedha early_announce early_dbprompt examples examples/tutorial/cc_acc gateway ivr jsonrpc mailbox memcachedstore mobile_push mp3 msg_storage mwi pin_collect precoded_announce py_sems rtmp twit voicebox voicemail webconference sw_rating
+ endif
+
  exclude_modules = $(exclude_app_modules)
  exclude_modules += $(local_exclude_app_modules)