diff --git a/mozilla/modules/plugin/makefile.win b/mozilla/modules/plugin/makefile.win
index 3fdb1903db7..1974ff7a88b 100644
--- a/mozilla/modules/plugin/makefile.win
+++ b/mozilla/modules/plugin/makefile.win
@@ -23,6 +23,10 @@ DEPTH=..\..
 
 DIRS= base\public base\src samples\default\windows
 
+!ifndef DISABLE_TESTS
+DIRS = $(DIRS) samples\simple
+!endif
+
 #//------------------------------------------------------------------------
 #//
 #// Include the common makefile rules
diff --git a/mozilla/modules/plugin/samples/simple/Makefile.in b/mozilla/modules/plugin/samples/simple/Makefile.in
index 56e1abb3e38..643dc96ca4a 100644
--- a/mozilla/modules/plugin/samples/simple/Makefile.in
+++ b/mozilla/modules/plugin/samples/simple/Makefile.in
@@ -37,6 +37,9 @@ REQUIRES	= xpcom \
 		  widget \
 		  $(NULL)
 
+# Make sure that it builds but don't install it
+NO_DIST_INSTALL	= 1
+
 XPIDLSRCS	= nsISimplePluginInstance.idl
 
 CPPSRCS		= npsimple.cpp
diff --git a/mozilla/modules/plugin/samples/simple/makefile.win b/mozilla/modules/plugin/samples/simple/makefile.win
index 812aa6553f7..f4579386d17 100644
--- a/mozilla/modules/plugin/samples/simple/makefile.win
+++ b/mozilla/modules/plugin/samples/simple/makefile.win
@@ -24,9 +24,12 @@ MODULE		= npsimple
 REQUIRES	= xpcom plugin string
 
 LIBRARY_NAME	= npsimple
+MODULE_NAME     = SimplePlugin
 
 DEPTH = ..\..\..\..
 
+# Make sure that it builds but don't install it
+NO_DIST_INSTALL = 1
 
 XPIDLSRCS = \
 	.\nsISimplePluginInstance.idl \
@@ -87,7 +90,3 @@ LINCS=$(LINCS) -I$(PUBLIC)\plugin -I$(PUBLIC)\xpcom -I$(PUBLIC)\java -I$(PUBLIC)
 LCFLAGS = $(LCFLAGS) -DNEW_PLUGIN_STREAM_API
 !endif
 
-libs:: $(DLL)
-#        $(MAKE_INSTALL) $(XPDIST)\classes11\Simple.class $(DEPTH)\cmd\winfe\mkfiles32\x86dbg\plugins\simple
-#        $(MAKE_INSTALL) Simple.class $(DEPTH)\cmd\winfe\mkfiles32\x86dbg\plugins\simple
-        $(MAKE_INSTALL) $(OBJDIR)\npsimple.dll $(DIST)\bin\components