diff --git a/tests/suites/test_suite_debug.data b/tests/suites/test_suite_debug.data
index af153b9013..e7bdf69a8f 100644
--- a/tests/suites/test_suite_debug.data
+++ b/tests/suites/test_suite_debug.data
@@ -5,6 +5,9 @@ printf_int_expr:(uintptr_t) "%" MBEDTLS_PRINTF_SIZET:sizeof(size_t):0:"0"
 printf "%" MBEDTLS_PRINTF_LONGLONG, 0
 printf_int_expr:(uintptr_t) "%" MBEDTLS_PRINTF_LONGLONG:sizeof(long long):0:"0"
 
+printf "%" MBEDTLS_PRINTF_MS_TIME, 0
+printf_int_expr:(uintptr_t) "%" MBEDTLS_PRINTF_MS_TIME:MBEDTLS_MS_TIME_SIZE:0:"0"
+
 Debug print msg (threshold 1, level 0)
 debug_print_msg_threshold:1:0:"MyFile":999:"MyFile(0999)\: Text message, 2 == 2\n"
 
diff --git a/tests/suites/test_suite_debug.function b/tests/suites/test_suite_debug.function
index a8a8c68fa3..af91ea43f0 100644
--- a/tests/suites/test_suite_debug.function
+++ b/tests/suites/test_suite_debug.function
@@ -4,6 +4,15 @@
 #include "mbedtls/pk.h"
 #include <test/ssl_helpers.h>
 
+// Use a macro instead of sizeof(mbedtls_ms_time_t) because the expression store
+// doesn't exclude entries based on depends_on headers, which would cause failures
+// in builds without MBEDTLS_HAVE_TIME
+#if defined(MBEDTLS_PLATFORM_MS_TIME_TYPE_MACRO)
+#   define MBEDTLS_MS_TIME_SIZE sizeof(MBEDTLS_PLATFORM_MS_TIME_TYPE_MACRO)
+#else
+#   define MBEDTLS_MS_TIME_SIZE sizeof(int64_t)
+#endif
+
 struct buffer_data {
     char buf[2000];
     char *ptr;