diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am
index 7d66a13d3d..163d777c32 100644
--- a/src/app-utils/test/Makefile.am
+++ b/src/app-utils/test/Makefile.am
@@ -37,7 +37,7 @@ LDADD = \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/gnc-module/libgnc-module.la \
    ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-   ${top_builddir}/src/test-core/libgncmod-test.la \
+   ${top_builddir}/src/test-core/libtest-core.la \
    ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
    ${top_builddir}/src/core-utils/libgnc-core-utils.la \
    ${top_builddir}/src/libqof/qof/libgnc-qof.la \
diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am
index cb77cbd159..ad1e37ea78 100644
--- a/src/backend/dbi/test/Makefile.am
+++ b/src/backend/dbi/test/Makefile.am
@@ -34,7 +34,7 @@ check_PROGRAMS = \
 
 #noinst_HEADERS = test-file-stuff.h
 
-LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
+LDADD = ${top_builddir}/src/test-core/libtest-core.la \
         ${top_builddir}/src/gnc-module/libgnc-module.la \
         ${top_builddir}/src/engine/libgncmod-engine.la \
         ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
diff --git a/src/backend/sql/test/Makefile.am b/src/backend/sql/test/Makefile.am
index bcfa9e316f..a74026a52d 100644
--- a/src/backend/sql/test/Makefile.am
+++ b/src/backend/sql/test/Makefile.am
@@ -37,7 +37,7 @@ check_PROGRAMS = \
 
 #noinst_HEADERS = test-file-stuff.h
 
-LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
+LDADD = ${top_builddir}/src/test-core/libtest-core.la \
         ${top_builddir}/src/gnc-module/libgnc-module.la \
         ${top_builddir}/src/engine/libgncmod-engine.la \
         ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am
index b483411b37..05a046b5b9 100644
--- a/src/backend/xml/test/Makefile.am
+++ b/src/backend/xml/test/Makefile.am
@@ -218,7 +218,7 @@ check_PROGRAMS = \
 
 noinst_HEADERS = test-file-stuff.h
 
-LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
+LDADD = ${top_builddir}/src/test-core/libtest-core.la \
         ${top_builddir}/src/gnc-module/libgnc-module.la \
         ${top_builddir}/src/engine/libgncmod-engine.la \
         ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
diff --git a/src/business/business-core/test/Makefile.am b/src/business/business-core/test/Makefile.am
index 063c0af281..a3e3425b56 100644
--- a/src/business/business-core/test/Makefile.am
+++ b/src/business/business-core/test/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
 
 LDADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/test-core/libgncmod-test.la \
+  ${top_builddir}/src/test-core/libtest-core.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ../libgncmod-business-core.la \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
index b3663e7d3f..f69a733ecd 100644
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
 
 LDADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/test-core/libgncmod-test.la \
+  ${top_builddir}/src/test-core/libtest-core.la \
   ../libgncmod-engine.la \
   ../test-core/libgncmod-test-engine.la \
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am
index 36cbebbc8e..8e1cd3dba4 100644
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@@ -47,7 +47,7 @@ LDADD = \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-  ${top_builddir}/src/test-core/libgncmod-test.la
+  ${top_builddir}/src/test-core/libtest-core.la
 
 test_gnc_recurrence_SOURCES=test-gnc-recurrence.c
 
diff --git a/src/import-export/qif/test/Makefile.am b/src/import-export/qif/test/Makefile.am
index cda1af4528..9c43a43e55 100644
--- a/src/import-export/qif/test/Makefile.am
+++ b/src/import-export/qif/test/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
 
 LDADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/test-core/libgncmod-test.la \
+  ${top_builddir}/src/test-core/libtest-core.la \
   ../../libgncmod-generic-import.la \
   ../libgncmod-qif.la \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am
index f412021808..b104864c43 100644
--- a/src/import-export/test/Makefile.am
+++ b/src/import-export/test/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
 
 LDADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/test-core/libgncmod-test.la \
+  ${top_builddir}/src/test-core/libtest-core.la \
   ../libgncmod-generic-import.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index 702210572d..3afc053212 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -1,15 +1,12 @@
-noinst_LTLIBRARIES=libgncmod-test.la
+noinst_LTLIBRARIES=libtest-core.la
 
-libgncmod_test_la_SOURCES = gncmod-test.c test-stuff.c
-libgncmod_test_la_LDFLAGS = -module
-libgncmod_test_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+libtest_core_la_SOURCES = test-stuff.c
+libtest_core_la_LDFLAGS = -module
+libtest_core_la_LIBADD = \
   ${GLIB_LIBS}
 
 noinst_HEADERS=test-stuff.h
 
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GLIB_CFLAGS}
diff --git a/src/test-core/gncmod-test.c b/src/test-core/gncmod-test.c
deleted file mode 100644
index f118ef1fa9..0000000000
--- a/src/test-core/gncmod-test.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*********************************************************************
- * gncmod-test.c
- * module definition/initialization for the test infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-
-#include <stdio.h>
-#include <gmodule.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-GNC_MODULE_API_DECL(libgncmod_test)
-
-/* version of the gnc module system interface we require */
-int libgncmod_test_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_test_gnc_module_current  = 0;
-int libgncmod_test_gnc_module_revision = 0;
-int libgncmod_test_gnc_module_age      = 0;
-
-
-char *
-libgncmod_test_gnc_module_path(void)
-{
-    return g_strdup("gnucash/test");
-}
-
-char *
-libgncmod_test_gnc_module_description(void)
-{
-    return g_strdup("Basic GnuCash test infrastructure.");
-}
-
-int
-libgncmod_test_gnc_module_init(int refcount)
-{
-    return TRUE;
-}
-
-int
-libgncmod_test_gnc_module_end(int refcount)
-{
-    return TRUE;
-}