diff --git a/.gitignore b/.gitignore
index 9db59d0116..d6c752e8d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,9 +192,6 @@ gnucash/gnucash-launcher
 gnucash/gnucash-make-guids
 gnucash/gnucash-setup-env
 gnucash/gnucash-valgrind
-gnucash/overrides/gnucash-build-env
-gnucash/overrides/gnucash-env
-gnucash/overrides/guile
 gnucash/gnome/gnucash
 gnucash/gnome/gnucash.desktop
 gnucash/gnome/gnucash.desktop.in
diff --git a/common/cmake_modules/MakeDistFiles.cmake b/common/cmake_modules/MakeDistFiles.cmake
index 405c87d23c..bb574997d5 100644
--- a/common/cmake_modules/MakeDistFiles.cmake
+++ b/common/cmake_modules/MakeDistFiles.cmake
@@ -46,7 +46,6 @@ SET(COPY_FROM_BUILD
   libgnucash/app-utils/swig-app-utils-python.c
   libgnucash/backend/xml/test/test-real-data.sh
   gnucash/gnucash.rc
-  gnucash/overrides/gnucash-make-guids
   gnucash/test/test-version
   libgnucash/core-utils/gnc-vcs-info.h
   libgnucash/core-utils/swig-core-utils-guile.c
diff --git a/configure.ac b/configure.ac
index 21d62adeaf..83f76fb0a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1654,7 +1654,6 @@ AC_CONFIG_FILES(
   doc/Makefile
   doc/examples/Makefile
   gnucash/Makefile
-  gnucash/test/Makefile
   gnucash/gnome/Makefile
   gnucash/gnome/gtkbuilder/Makefile
   gnucash/gnome/gschemas/Makefile
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index fe928ce16e..e18aaa10b6 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -9,7 +9,6 @@ ADD_SUBDIRECTORY (import-export)
 ADD_SUBDIRECTORY (python)
 ADD_SUBDIRECTORY (register)
 ADD_SUBDIRECTORY (report)
-ADD_SUBDIRECTORY (test)
 
 ADD_DEFINITIONS (-DHAVE_CONFIG_H)
 
@@ -87,25 +86,6 @@ ENDIF(MAC_INTEGRATION)
 INSTALL(TARGETS gnucash DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-# Generate the gnucash-env script
-SET(SCRIPT_LIST  "")
-SET(SCRIPT_OUTPUT_DIR ${BINDIR_BUILD})
-
-FOREACH (script gnucash-env gnucash-make-guids)
-  SET (GNUCASH_ENV_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${script})
-  LIST(APPEND SCRIPT_LIST ${SCRIPT_OUTPUT_DIR}/${script})
-  SET (GNC_OVERRIDES_DIR ${CMAKE_INSTALL_LIBEXECDIR}/gnucash/overrides)
-  FILE(WRITE ${GNUCASH_ENV_SCRIPT} "#!/bin/sh\n")
-  FILE(APPEND ${GNUCASH_ENV_SCRIPT} "PATH=\"${GNC_OVERRIDES_DIR}:\${PATH}\"\n")
-  FILE(APPEND ${GNUCASH_ENV_SCRIPT} "export PATH\n")
-  FILE(APPEND ${GNUCASH_ENV_SCRIPT} "\nGUILE_WARN_DEPRECATED=\"no\"\n")
-  FILE(APPEND ${GNUCASH_ENV_SCRIPT} "export GUILE_WARN_DEPRECATED\n")
-  FILE(APPEND ${GNUCASH_ENV_SCRIPT} "\nexec \"${script}\" \"\$@\"\n")
-  FILE(COPY ${GNUCASH_ENV_SCRIPT}
-       DESTINATION ${SCRIPT_OUTPUT_DIR}
-       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-  )
-ENDFOREACH(script)
 
 SET(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
 SET(GNUCASH_BIN_INSTALL_NAME "gnucash")
diff --git a/gnucash/Makefile.am b/gnucash/Makefile.am
index 8170ee72f2..9e77444999 100644
--- a/gnucash/Makefile.am
+++ b/gnucash/Makefile.am
@@ -11,8 +11,7 @@ SUBDIRS = \
   register \
   gnome \
   import-export \
-  . \
-  test
+  .
 
 AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
   -DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \
@@ -118,40 +117,6 @@ endif
 
 CLEANFILES = $(BUILT_SOURCES) ${config_DATA} ${PLATFORM_FILES}
 
-if !PLATFORM_WIN32
-# The gnucash scripts don't make sense on Windows, so will only be
-# generated and included on the other platforms.
-# We handle gnucash scripts in a somewhat unexpected way, but we do
-# this so that a user who doesn't necessarily have the right
-# directories in their path can still invoke these commands via their
-# full path, say /some/dir/not/in/path/gnucash and still have the
-# right thing happen (i.e. they'll still get the right guile, and the
-# right scripts if they sub-exec anything from their scripts).  If you
-# want to add another gnucash script, please add the name here (which
-# will cause the bindir wrapper to be created, and then put the actual
-# code in a script of the same name in ./overrides.  Oh, and don't
-# forget to add your script to configure.in's "Adjustments" section if
-# you need to.
-#
-# For testing and other reasons, overrides/* scripts should not modify
-# the path to re-insert the overrides dir.  This should only be done
-# by these top-level "common" scripts.
-gnc_common_scripts = gnucash-env gnucash-make-guids
-
-bin_SCRIPTS = \
-    ${gnc_common_scripts} \
-	${PLATFORM_FILES}
-
-# if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
-gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
-
-## Gnucash scripts -- real code is in overrides, these just get you there.
-${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status
-	${srcdir}/generate-gnc-script $@ "${gncoverridesdir}"
-
-CLEANFILES += ${gnc_common_scripts}
-
-endif
 
 EXTRA_DIST = \
 	generate-gnc-script \