diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 0679fca5..7cef68c8 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -116,7 +116,6 @@ endif()
 ### keep these in creation order, i.e. uppermost dirs first 
 set (TESTDIRS
     test/data
-    test/data/valid-messages
     test/data/invalid-messages
     test/data/incomplete-messages
     test/data/auth
@@ -127,7 +126,6 @@ set (TESTDIRS
     test/data/valid-config-files/session.d
     test/data/valid-config-files-system
     test/data/valid-config-files-system/system.d
-    test/data/valid-messages
     test/data/valid-service-files
     test/data/valid-service-files-system
     test/data/invalid-config-files
diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
index 1bfc0d00..2a4cdf37 100644
--- a/dbus/dbus-message-util.c
+++ b/dbus/dbus-message-util.c
@@ -719,13 +719,7 @@ dbus_internal_do_not_use_foreach_message_file (const char                *test_d
   retval = FALSE;
 
   _dbus_string_init_const (&test_directory, test_data_dir);
-  
-  if (!process_test_subdir (&test_directory, "valid-messages",
-                            DBUS_VALID, func, user_data))
-    goto failed;
 
-  check_memleaks ();
-  
   if (!process_test_subdir (&test_directory, "invalid-messages",
                             DBUS_INVALID_FOR_UNKNOWN_REASON, func, user_data))
     goto failed;