diff --git a/Makefile.am b/Makefile.am
index 3705762f0..9ece841c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ AUTOMAKE_OPTIONS = 1.10
 
 SUBDIRS = lib meta libguile guile-readline emacs \
 	  srfi examples test-suite benchmark-suite am \
-	  module doc testsuite
+	  module doc
 
 libguileincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
 libguileinclude_HEADERS = libguile.h
diff --git a/configure.ac b/configure.ac
index 73a4bd24d..3877411ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1632,9 +1632,9 @@ AC_CONFIG_FILES([
   guile-readline/Makefile
   test-suite/Makefile
   test-suite/standalone/Makefile
+  test-suite/vm/Makefile
   meta/Makefile
   module/Makefile
-  testsuite/Makefile
 ])
 
 AC_CONFIG_FILES([meta/guile-2.0.pc])
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 2c1f2293d..7d656459a 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -19,7 +19,7 @@
 ##   write to the Free Software Foundation, Inc., 51 Franklin Street,
 ##   Fifth Floor, Boston, MA 02110-1301 USA
 
-SUBDIRS = standalone
+SUBDIRS = standalone vm
 
 SCM_TESTS = tests/00-initial-env.test		\
             tests/alist.test			\
diff --git a/testsuite/Makefile.am b/test-suite/vm/Makefile.am
similarity index 100%
rename from testsuite/Makefile.am
rename to test-suite/vm/Makefile.am
diff --git a/testsuite/run-vm-tests.scm b/test-suite/vm/run-vm-tests.scm
similarity index 100%
rename from testsuite/run-vm-tests.scm
rename to test-suite/vm/run-vm-tests.scm
diff --git a/testsuite/t-basic-contructs.scm b/test-suite/vm/t-basic-contructs.scm
similarity index 100%
rename from testsuite/t-basic-contructs.scm
rename to test-suite/vm/t-basic-contructs.scm
diff --git a/testsuite/t-call-cc.scm b/test-suite/vm/t-call-cc.scm
similarity index 100%
rename from testsuite/t-call-cc.scm
rename to test-suite/vm/t-call-cc.scm
diff --git a/testsuite/t-catch.scm b/test-suite/vm/t-catch.scm
similarity index 100%
rename from testsuite/t-catch.scm
rename to test-suite/vm/t-catch.scm
diff --git a/testsuite/t-closure.scm b/test-suite/vm/t-closure.scm
similarity index 100%
rename from testsuite/t-closure.scm
rename to test-suite/vm/t-closure.scm
diff --git a/testsuite/t-closure2.scm b/test-suite/vm/t-closure2.scm
similarity index 100%
rename from testsuite/t-closure2.scm
rename to test-suite/vm/t-closure2.scm
diff --git a/testsuite/t-closure3.scm b/test-suite/vm/t-closure3.scm
similarity index 100%
rename from testsuite/t-closure3.scm
rename to test-suite/vm/t-closure3.scm
diff --git a/testsuite/t-closure4.scm b/test-suite/vm/t-closure4.scm
similarity index 100%
rename from testsuite/t-closure4.scm
rename to test-suite/vm/t-closure4.scm
diff --git a/testsuite/t-do-loop.scm b/test-suite/vm/t-do-loop.scm
similarity index 100%
rename from testsuite/t-do-loop.scm
rename to test-suite/vm/t-do-loop.scm
diff --git a/testsuite/t-global-bindings.scm b/test-suite/vm/t-global-bindings.scm
similarity index 100%
rename from testsuite/t-global-bindings.scm
rename to test-suite/vm/t-global-bindings.scm
diff --git a/testsuite/t-literal-integers.scm b/test-suite/vm/t-literal-integers.scm
similarity index 100%
rename from testsuite/t-literal-integers.scm
rename to test-suite/vm/t-literal-integers.scm
diff --git a/testsuite/t-macros.scm b/test-suite/vm/t-macros.scm
similarity index 100%
rename from testsuite/t-macros.scm
rename to test-suite/vm/t-macros.scm
diff --git a/testsuite/t-macros2.scm b/test-suite/vm/t-macros2.scm
similarity index 100%
rename from testsuite/t-macros2.scm
rename to test-suite/vm/t-macros2.scm
diff --git a/testsuite/t-map.scm b/test-suite/vm/t-map.scm
similarity index 100%
rename from testsuite/t-map.scm
rename to test-suite/vm/t-map.scm
diff --git a/testsuite/t-match.scm b/test-suite/vm/t-match.scm
similarity index 100%
rename from testsuite/t-match.scm
rename to test-suite/vm/t-match.scm
diff --git a/testsuite/t-mutual-toplevel-defines.scm b/test-suite/vm/t-mutual-toplevel-defines.scm
similarity index 100%
rename from testsuite/t-mutual-toplevel-defines.scm
rename to test-suite/vm/t-mutual-toplevel-defines.scm
diff --git a/testsuite/t-or.scm b/test-suite/vm/t-or.scm
similarity index 100%
rename from testsuite/t-or.scm
rename to test-suite/vm/t-or.scm
diff --git a/testsuite/t-proc-with-setter.scm b/test-suite/vm/t-proc-with-setter.scm
similarity index 100%
rename from testsuite/t-proc-with-setter.scm
rename to test-suite/vm/t-proc-with-setter.scm
diff --git a/testsuite/t-quasiquote.scm b/test-suite/vm/t-quasiquote.scm
similarity index 100%
rename from testsuite/t-quasiquote.scm
rename to test-suite/vm/t-quasiquote.scm
diff --git a/testsuite/t-records.scm b/test-suite/vm/t-records.scm
similarity index 100%
rename from testsuite/t-records.scm
rename to test-suite/vm/t-records.scm
diff --git a/testsuite/t-values.scm b/test-suite/vm/t-values.scm
similarity index 100%
rename from testsuite/t-values.scm
rename to test-suite/vm/t-values.scm
diff --git a/testsuite/the-bug.txt b/test-suite/vm/the-bug.txt
similarity index 100%
rename from testsuite/the-bug.txt
rename to test-suite/vm/the-bug.txt