diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 29b73b43..2931415e 100644
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -152,9 +152,6 @@ set (DBUS_SHARED_HEADERS
 ### to be unless they move to DBUS_SHARED_SOURCES later)
 set (DBUS_UTIL_SOURCES
 	${DBUS_DIR}/dbus-asv-util.c
-	${DBUS_DIR}/dbus-auth-script.c
-	${DBUS_DIR}/dbus-auth-util.c
-	${DBUS_DIR}/dbus-credentials-util.c
 	${DBUS_DIR}/dbus-mainloop.c
 	${DBUS_DIR}/dbus-marshal-byteswap-util.c
 	${DBUS_DIR}/dbus-marshal-recursive-util.c
@@ -170,7 +167,6 @@ set (DBUS_UTIL_SOURCES
 
 set (DBUS_UTIL_HEADERS
 	${DBUS_DIR}/dbus-asv-util.h
-	${DBUS_DIR}/dbus-auth-script.h
 	${DBUS_DIR}/dbus-mainloop.h
 	${DBUS_DIR}/dbus-message-factory.h
 	${DBUS_DIR}/dbus-shell.h
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index ff70fc2c..32efb2c7 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -102,7 +102,13 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
     add_test_executable(test-message-internals ${TEST_DIR}/internals/message-internals.c dbus-testutils)
     set_target_properties(test-message-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 
-    add_test_executable(test-misc-internals ${TEST_DIR}/internals/misc-internals.c dbus-testutils)
+    set(SOURCES ${TEST_DIR}/internals/dbus-auth-script.c
+                ${TEST_DIR}/internals/dbus-auth-script.h
+                ${TEST_DIR}/internals/dbus-auth-util.c
+                ${TEST_DIR}/internals/dbus-credentials-util.c
+                ${TEST_DIR}/internals/misc-internals.c
+                ${TEST_DIR}/internals/misc-internals.h)
+    add_test_executable(test-misc-internals "${SOURCES}" dbus-testutils)
     set_target_properties(test-misc-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 
     set(SOURCES ${TEST_DIR}/bus/main.c)
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index d92c5425..5818c886 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -245,10 +245,6 @@ DBUS_SHARED_SOURCES=				\
 DBUS_UTIL_SOURCES=				\
 	dbus-asv-util.c				\
 	dbus-asv-util.h				\
-	dbus-auth-script.c			\
-	dbus-auth-script.h			\
-	dbus-auth-util.c			\
-	dbus-credentials-util.c			\
 	dbus-mainloop.c				\
 	dbus-mainloop.h				\
 	dbus-marshal-byteswap-util.c		\
diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h
index 6be55f39..9d6e755c 100644
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -65,7 +65,6 @@ DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_server_test            (const char *test_data_dir);
 
 dbus_bool_t _dbus_message_test           (const char *test_data_dir);
-dbus_bool_t _dbus_auth_test              (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_sha_test               (const char *test_data_dir);
@@ -90,8 +89,6 @@ dbus_bool_t _dbus_memory_test            (const char *test_data_dir);
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_object_tree_test       (const char *test_data_dir);
 
-dbus_bool_t _dbus_credentials_test       (const char *test_data_dir);
-
 dbus_bool_t _dbus_test_generate_bodies   (int         sequence,
                                           int         byte_order,
                                           DBusString *signature,
diff --git a/test/Makefile.am b/test/Makefile.am
index 58e72559..451655b3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -209,7 +209,14 @@ test_marshal_recursive_LDADD = libdbus-testutils.la
 test_message_internals_SOURCES = internals/message-internals.c
 test_message_internals_LDADD = libdbus-testutils.la
 
-test_misc_internals_SOURCES = internals/misc-internals.c
+test_misc_internals_SOURCES = \
+	internals/dbus-auth-script.c \
+	internals/dbus-auth-script.h \
+	internals/dbus-auth-util.c \
+	internals/dbus-credentials-util.c \
+	internals/misc-internals.c \
+	internals/misc-internals.h \
+	$(NULL)
 test_misc_internals_LDADD = libdbus-testutils.la
 
 EXTRA_DIST += dbus-test-runner
diff --git a/dbus/dbus-auth-script.c b/test/internals/dbus-auth-script.c
similarity index 99%
rename from dbus/dbus-auth-script.c
rename to test/internals/dbus-auth-script.c
index e7844023..85103010 100644
--- a/dbus/dbus-auth-script.c
+++ b/test/internals/dbus-auth-script.c
@@ -24,16 +24,18 @@
 
 #ifdef DBUS_ENABLE_EMBEDDED_TESTS
 
+#include "misc-internals.h"
+
 #include "dbus-auth-script.h"
 
 #include <stdio.h>
 
-#include "dbus-auth.h"
-#include "dbus-string.h"
-#include "dbus-hash.h"
-#include "dbus-credentials.h"
-#include "dbus-internals.h"
-#include <dbus/dbus-test-tap.h>
+#include "dbus/dbus-auth.h"
+#include "dbus/dbus-credentials.h"
+#include "dbus/dbus-hash.h"
+#include "dbus/dbus-internals.h"
+#include "dbus/dbus-string.h"
+#include "dbus/dbus-test-tap.h"
 
 #ifdef DBUS_UNIX
 # include "dbus/dbus-userdb.h"
diff --git a/dbus/dbus-auth-script.h b/test/internals/dbus-auth-script.h
similarity index 100%
rename from dbus/dbus-auth-script.h
rename to test/internals/dbus-auth-script.h
diff --git a/dbus/dbus-auth-util.c b/test/internals/dbus-auth-util.c
similarity index 96%
rename from dbus/dbus-auth-util.c
rename to test/internals/dbus-auth-util.c
index 5fb30a8e..bd862b0e 100644
--- a/dbus/dbus-auth-util.c
+++ b/test/internals/dbus-auth-util.c
@@ -22,10 +22,13 @@
  */
 
 #include <config.h>
-#include "dbus-internals.h"
-#include "dbus-test.h"
-#include "dbus-auth.h"
-#include <dbus/dbus-test-tap.h>
+
+#include "misc-internals.h"
+
+#include "dbus/dbus-auth.h"
+#include "dbus/dbus-internals.h"
+#include "dbus/dbus-test-tap.h"
+#include "dbus/dbus-test.h"
 
 /**
  * @addtogroup DBusAuth
diff --git a/dbus/dbus-credentials-util.c b/test/internals/dbus-credentials-util.c
similarity index 98%
rename from dbus/dbus-credentials-util.c
rename to test/internals/dbus-credentials-util.c
index 7855b797..8c497b22 100644
--- a/dbus/dbus-credentials-util.c
+++ b/test/internals/dbus-credentials-util.c
@@ -22,10 +22,13 @@
  */
 
 #include <config.h>
-#include "dbus-internals.h"
-#include "dbus-test.h"
-#include "dbus-credentials.h"
-#include <dbus/dbus-test-tap.h>
+
+#include "misc-internals.h"
+
+#include "dbus/dbus-credentials.h"
+#include "dbus/dbus-internals.h"
+#include "dbus/dbus-test-tap.h"
+#include "dbus/dbus-test.h"
 
 /**
  * @addtogroup DBusCredentials
diff --git a/test/internals/misc-internals.c b/test/internals/misc-internals.c
index 54094abe..579b00e7 100644
--- a/test/internals/misc-internals.c
+++ b/test/internals/misc-internals.c
@@ -27,6 +27,8 @@
 #include "dbus/dbus-test.h"
 #include "test/test-utils.h"
 
+#include "misc-internals.h"
+
 static DBusTestCase tests[] =
 {
   { "string", _dbus_string_test },
diff --git a/test/internals/misc-internals.h b/test/internals/misc-internals.h
new file mode 100644
index 00000000..3b14d426
--- /dev/null
+++ b/test/internals/misc-internals.h
@@ -0,0 +1,32 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright 2002-2009 Red Hat, Inc.
+ * Copyright 2011-2018 Collabora Ltd.
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef TEST_INTERNALS_MISC_INTERNALS_H
+#define TEST_INTERNALS_MISC_INTERNALS_H
+
+#include <dbus/dbus-types.h>
+
+dbus_bool_t _dbus_auth_test              (const char *test_data_dir);
+dbus_bool_t _dbus_credentials_test       (const char *test_data_dir);
+
+#endif