--- Makefile.org
+++ Makefile.org
@@ -149,7 +149,7 @@
 
 # tests to perform.  "alltests" is a special word indicating that all tests
 # should be performed.
-TESTS = alltests
+TESTS =
 
 MAKEFILE= Makefile
 
@@ -161,7 +161,7 @@
 
 TOP=    .
 ONEDIRS=out tmp
-EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
+EDIRS=  times     bugs util include certs ms shlib mt demos perl sf dep VMS
 WDIRS=  windows
 LIBS=   libcrypto.a libssl.a
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
@@ -321,7 +321,7 @@
 	../crypto/uid.o
 
 sub_all: build_all
-build_all: build_libs build_apps build_tests build_tools
+build_all: build_libs build_apps             build_tools
 
 build_libs: build_crypto build_fips build_ssl build_shared build_engines
 
@@ -346,7 +346,7 @@
 build_tools: build_libs
 	@dir=tools; target=all; $(BUILD_ONE_CMD)
 
-all_testapps: build_libs build_testapps
+all_testapps: build_libs
 build_testapps:
 	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
@@ -618,7 +618,7 @@
 dist_pem_h:
 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
 
-install: all install_docs install_sw
+install: all              install_sw
 
 install_sw:
 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \