diff --git a/mozilla/xpcom/Makefile.in b/mozilla/xpcom/Makefile.in
index 5e345929574..b4e7ab57fef 100644
--- a/mozilla/xpcom/Makefile.in
+++ b/mozilla/xpcom/Makefile.in
@@ -26,10 +26,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= typelib base ds io components threads reflect proxy build tools sample
+DIRS		= typelib base ds io components threads reflect proxy build tools
 
 ifdef ENABLE_TESTS
 DIRS		+= \
+	sample \
 	typelib/xpt/tests \
 	reflect/xptinfo/tests \
 	reflect/xptcall/tests \
diff --git a/mozilla/xpcom/makefile.win b/mozilla/xpcom/makefile.win
index 04443854a64..3a43cddf833 100644
--- a/mozilla/xpcom/makefile.win
+++ b/mozilla/xpcom/makefile.win
@@ -34,8 +34,8 @@ DIRS=   typelib        \
         build          \
         appshell       \
         tools          \
-        sample         \
 !if !defined(DISABLE_TESTS)
+        sample         \
         tests          \
         reflect\xptinfo\tests \
         reflect\xptcall\tests \