diff --git a/INSTALL b/INSTALL
index 69599bc07..967c658ad 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@
  To install OpenSSL, you will need:
 
   * Perl 5
-  * ANSI C compiler
+  * an ANSI C compiler
   * a supported Unix operating system
 
  Quick Start
@@ -17,7 +17,6 @@
 
   $ ./config                  [if this fails, go to step 1b below]
   $ make
-  $ make rehash
   $ make test
   $ make install
 
@@ -75,7 +74,8 @@
        $ ./Configure linux-elf [--prefix=DIR] [--openssldir=OPENSSLDIR]
 
      If your system is not available, you will have to edit the Configure
-     program and add the correct configuration for your system.
+     program and add the correct configuration for your system. The
+     generic configurations "cc" or "gcc" should usually work.
 
      Configure creates the Makefile.ssl from Makefile.org and defines
      various macros in crypto/opensslconf.h (generated from
@@ -91,12 +91,8 @@
 
   3. After a successful build, the libraries should be tested. Run:
 
-       $ make rehash
        $ make test
 
-     (The first line makes the test certificates in the "certs" directory
-     accessable via an hash name, which is required for some of the tests).
-
   4. If everything tests ok, install OpenSSL with
 
        $ make install
diff --git a/Makefile.org b/Makefile.org
index 7531f5a2d..09648b2c2 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -238,7 +238,7 @@ rehash:
 
 test:   tests
 
-tests:
+tests: rehash
 	@(cd test && echo "testing..." && \
 	$(MAKE) CC='${CC}' 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}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );
 	@apps/openssl version -a