diff --git a/mozilla/mailnews/compose/tests/Makefile.in b/mozilla/mailnews/compose/tests/Makefile.in
index ec1019b21bb..1709185507d 100644
--- a/mozilla/mailnews/compose/tests/Makefile.in
+++ b/mozilla/mailnews/compose/tests/Makefile.in
@@ -15,55 +15,14 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=../../..
+DEPTH = ../../..
 topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
 VPATH		= @srcdir@
+srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PROGRAM	= smtpTest
-
-CPPSRCS = \
-	smtpTest.cpp		   \
-	$(NULL)
-
-ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
-endif
-
-LIBS = \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lremoturl \
-	-lhttpurl \
-	-lsockstuburl \
-	-lnetcache \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetwork \
-	-lnetlib \
-	-lnetutil \
-	-lsmtp	\
-	-lrdf \
-	-lmailnewsbase \
-	-lreg	\
-	-lxpcom	\
-	-lpwcac \
-	-lmozdbm	\
-	-lxp	\
-	-lpref	\
-	-ljs	\
-	-lraptorbase \
-	-lgmbase$(MOZ_TOOLKIT) \
-	-lsecfree \
-	-lz \
-	$(DIST)/lib/librdfbase_s.a \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
+DIRS = compose smtp
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/mozilla/mailnews/compose/tests/makefile.win b/mozilla/mailnews/compose/tests/makefile.win
index 9b05b23c7c2..1e35de447a9 100644
--- a/mozilla/mailnews/compose/tests/makefile.win
+++ b/mozilla/mailnews/compose/tests/makefile.win
@@ -16,40 +16,7 @@
 # Reserved.
 
 DEPTH=..\..\..
-IGNORE_MANIFEST=1
 
-
-MAKE_OBJ_TYPE   = EXE
-PROGRAM = .\$(OBJDIR)\smtpTest.exe
-
-OBJS =                          \
-	.\$(OBJDIR)\smtpTest.obj    \
-	$(NULL)
-
-LINCS=-I$(PUBLIC)\raptor -I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib -I$(PUBLIC)\mailnews -I$(PUBLIC)\security -I$(PUBLIC)\pref -I$(PUBLIC)\rdf
-
-MYLIBS=							\
- $(DIST)\lib\xpcom32.lib		\
- $(LIBNSPR)						\
- $(DIST)\lib\raptorbase.lib		\
- $(DIST)\lib\raptorgfxwin.lib	\
- $(DIST)\lib\raptorwidget.lib	\
- $(DIST)\lib\netlib.lib			\
- $(DIST)\lib\libplc21.lib		\
- $(DIST)\lib\smtp.lib    		\
- $(DIST)\lib\msgcore.lib		\
- $(DIST)\lib\xplib.lib			\
- $(NULL)
-
-LLIBS= $(MYLIBS)				\
- -SUBSYSTEM:CONSOLE 
+DIRS=compose smtp
 
 include <$(DEPTH)\config\rules.mak>
-
-install:: $(PROGRAM)
-	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
-
-clobber::
-	rm -f $(DIST)\bin\Mailer.exe
-
-$(PROGRAM):: $(OBJS) $(MYLIBS)