diff --git a/tests/configs/config-wrapper-zeroize-memset.h b/tests/configs/user-config-zeroize-memset.h
similarity index 90%
rename from tests/configs/config-wrapper-zeroize-memset.h
rename to tests/configs/user-config-zeroize-memset.h
index d1bfa17..fcdd1f0 100644
--- a/tests/configs/config-wrapper-zeroize-memset.h
+++ b/tests/configs/user-config-zeroize-memset.h
@@ -1,4 +1,4 @@
-/* mbedtls_config.h wrapper that defines mbedtls_platform_zeroize() to be
+/* mbedtls_config.h modifier that defines mbedtls_platform_zeroize() to be
  * memset(), so that the compile can check arguments for us.
  * Used for testing.
  */
@@ -19,8 +19,6 @@
  *  limitations under the License.
  */
 
-#include "mbedtls/mbedtls_config.h"
-
 #include <string.h>
 
 /* Define _ALT so we don't get the built-in implementation. The test code will
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 0232711..4ed1949 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -3542,7 +3542,7 @@
     scripts/config.py full
 
     # Only compile - we're looking for sizeof-pointer-memaccess warnings
-    make CC=gcc CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/config-wrapper-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Werror -Wsizeof-pointer-memaccess"
+    make CC=gcc CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/user-config-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Werror -Wsizeof-pointer-memaccess"
 }