diff --git a/Makefile.org b/Makefile.org
index 2def579c2..8075911fd 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -180,6 +180,7 @@ all: Makefile.ssl
 	(cd $$i && echo "making all in $$i..." && \
 	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
 	done
+	(cd crypto; $(MAKE) testapps)
 	-@# cd perl; $(PERL) Makefile.PL; make
 
 sub_all:
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 37aaac152..17caee18f 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -57,6 +57,10 @@ buildinf.h: ../Makefile.ssl
 	echo "  #define DATE \"`date`\""; \
 	echo "#endif" ) >buildinf.h
 
+testapps:
+	(cd des && make des)
+	(cd pkcs7 && make testapps)
+
 subdirs:
 	@for i in $(SDIRS) ;\
 	do \
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index e9c94406e..789063b3c 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -53,7 +53,7 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
 
-all:	lib des
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
diff --git a/crypto/pkcs7/Makefile.ssl b/crypto/pkcs7/Makefile.ssl
index f6632b3b2..2974465ec 100644
--- a/crypto/pkcs7/Makefile.ssl
+++ b/crypto/pkcs7/Makefile.ssl
@@ -37,7 +37,7 @@ top:
 
 test:
 
-all:	lib testapps
+all:	lib
 
 testapps: enc dec sign verify