diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 4e4200be5bd..d6644d145b2 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -70,7 +70,7 @@ do
       sample)       AC_CONFIG_SUBDIRS([projects/sample])    ;;
       privbracket)  AC_CONFIG_SUBDIRS([projects/privbracket]) ;;
       llvm-stacker) AC_CONFIG_SUBDIRS([projects/llvm-stacker]) ;;
-      llvm-test)    AC_CONFIG_SUBDIRS([projects/llvm-test]) ;;
+      test-suite)   AC_CONFIG_SUBDIRS([projects/test-suite]) ;;
       llvm-reopt)   AC_CONFIG_SUBDIRS([projects/llvm-reopt]);;
       llvm-gcc)     AC_CONFIG_SUBDIRS([projects/llvm-gcc])  ;;
       llvm-java)    AC_CONFIG_SUBDIRS([projects/llvm-java]) ;;
diff --git a/configure b/configure
index 77e4cab20ea..bd9c309633d 100755
--- a/configure
+++ b/configure
@@ -944,7 +944,7 @@ FFLAGS'
 ac_subdirs_all='projects/sample
 projects/privbracket
 projects/llvm-stacker
-projects/llvm-test
+projects/test-suite
 projects/llvm-reopt
 projects/llvm-gcc
 projects/llvm-java
@@ -2074,7 +2074,7 @@ do
  ;;
       llvm-stacker) subdirs="$subdirs projects/llvm-stacker"
  ;;
-      llvm-test)    subdirs="$subdirs projects/llvm-test"
+      test-suite)   subdirs="$subdirs projects/test-suite"
  ;;
       llvm-reopt)   subdirs="$subdirs projects/llvm-reopt"
 ;;