diff --git a/autogen.sh b/autogen.sh
index d93616e954..ab1e0667f8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@
 # are automatically generated.
 
 # Check that we're being run from the right directory.
-if test ! -e src/google/protobuf/stubs/common.h; then
+if test ! -f src/google/protobuf/stubs/common.h; then
   cat >&2 << __EOF__
 Could not find source code.  Make sure you are running this script from the
 root of the distribution tree.
@@ -13,7 +13,7 @@ __EOF__
   exit 1
 fi
 
-if test ! -e gtest; then
+if test ! -d gtest; then
   echo "gtest bundle not present.  Downloading gtest-1.3.0 automatically." >&2
   set -ex
   curl http://googletest.googlecode.com/files/gtest-1.3.0.tar.bz2 | tar jx