diff --git a/configure.in b/configure.in
index d3e1264a8..b4708a7a5 100644
--- a/configure.in
+++ b/configure.in
@@ -1072,19 +1072,9 @@ AC_CONFIG_FILES([Makefile
                  tests/bsim1/Makefile
                  tests/bsim2/Makefile
                  tests/bsim3/Makefile
-                 tests/bsim3/Berkeley/Makefile
-                 tests/bsim3/Berkeley/3v0/Makefile
-                 tests/bsim3/Berkeley/3v0/ac_sim/Makefile
-                 tests/bsim3/Berkeley/3v0/dc_sim/Makefile
-                 tests/bsim3/Berkeley/3v0/tran_sim/Makefile
-                 tests/bsim3/Berkeley/3v1/Makefile
-                 tests/bsim3/Berkeley/3v1/ac_sim/Makefile
-                 tests/bsim3/Berkeley/3v1/dc_sim/Makefile
-                 tests/bsim3/Berkeley/3v1/tran_sim/Makefile
-                 tests/bsim3/Berkeley/3v2/Makefile
-                 tests/bsim3/Berkeley/3v2/ac_sim/Makefile
-                 tests/bsim3/Berkeley/3v2/dc_sim/Makefile
-                 tests/bsim3/Berkeley/3v2/tran_sim/Makefile
+                 tests/bsim3/ac_sim/Makefile
+                 tests/bsim3/dc_sim/Makefile
+                 tests/bsim3/tran_sim/Makefile
                  tests/bsim3soi/Makefile
                  tests/bsim3soidd/Makefile
                  tests/bsim3soifd/Makefile
diff --git a/tests/bsim3/Makefile.am b/tests/bsim3/Makefile.am
index 72b6899cb..29292d5bd 100644
--- a/tests/bsim3/Makefile.am
+++ b/tests/bsim3/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = Berkeley
+SUBDIRS = ac_sim dc_sim tran_sim
 
 MAINTAINERCLEANFILES = Makefile.in