diff --git a/test/testio.cpp b/test/testio.cpp
index 3378f8934..83aa1804a 100644
--- a/test/testio.cpp
+++ b/test/testio.cpp
@@ -1324,11 +1324,33 @@ private:
         TEST_SCANF_WARN_AKA("%ju", "uintmax_t", "std::intptr_t", "signed long", "signed long long");
         TEST_SCANF_WARN_AKA("%ju", "uintmax_t", "std::uintptr_t", "unsigned long", "unsigned long long");
 
+        TEST_SCANF_WARN("%jx", "uintmax_t", "bool");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "char");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "signed char");
         TEST_SCANF_WARN("%jx", "uintmax_t", "unsigned char");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "signed short");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "unsigned short");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "signed int");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "unsigned int");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "signed long");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "unsigned long");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "signed long long");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "unsigned long long");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "float");
+        TEST_SCANF_WARN("%jx", "uintmax_t", "double");
         TEST_SCANF_WARN("%jx", "uintmax_t", "long double");
         TEST_SCANF_WARN("%jx", "uintmax_t", "void *");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "size_t", "unsigned long", "unsigned long long");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "ssize_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "ptrdiff_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "unsigned ptrdiff_t", "unsigned long", "unsigned long long");
         TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "intmax_t", "signed long", "signed long long");
         TEST_SCANF_NOWARN("%jx", "uintmax_t", "uintmax_t");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "std::size_t", "unsigned long", "unsigned long long");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "std::ssize_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "std::ptrdiff_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "std::intptr_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%jx", "uintmax_t", "std::uintptr_t", "unsigned long", "unsigned long long");
 
         TEST_SCANF_WARN("%jd", "intmax_t", "long double");
         TEST_SCANF_WARN("%jd", "intmax_t", "void *");
@@ -1368,11 +1390,32 @@ private:
         TEST_SCANF_WARN_AKA("%zu", "size_t", "std::uintptr_t", "unsigned long", "unsigned long long");
 
         TEST_SCANF_WARN("%zx", "size_t", "bool");
+        TEST_SCANF_WARN("%zx", "size_t", "char");
+        TEST_SCANF_WARN("%zx", "size_t", "signed char");
         TEST_SCANF_WARN("%zx", "size_t", "unsigned char");
+        TEST_SCANF_WARN("%zx", "size_t", "signed short");
+        TEST_SCANF_WARN("%zx", "size_t", "unsigned short");
+        TEST_SCANF_WARN("%zx", "size_t", "signed int");
+        TEST_SCANF_WARN("%zx", "size_t", "unsigned int");
+        TEST_SCANF_WARN("%zx", "size_t", "signed long");
+        TEST_SCANF_WARN("%zx", "size_t", "unsigned long");
+        TEST_SCANF_WARN("%zx", "size_t", "signed long long");
+        TEST_SCANF_WARN("%zx", "size_t", "unsigned long long");
+        TEST_SCANF_WARN("%zx", "size_t", "float");
+        TEST_SCANF_WARN("%zx", "size_t", "double");
+        TEST_SCANF_WARN("%zx", "size_t", "long double");
         TEST_SCANF_WARN("%zx", "size_t", "void *");
         TEST_SCANF_NOWARN("%zx", "size_t", "size_t");
         TEST_SCANF_WARN_AKA("%zx", "size_t", "ssize_t", "signed long", "signed long long");
         TEST_SCANF_WARN_AKA("%zx", "size_t", "ptrdiff_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%zx", "size_t", "unsigned ptrdiff_t", "unsigned long", "unsigned long long");
+        TEST_SCANF_WARN_AKA("%zx", "size_t", "intmax_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%zx", "size_t", "uintmax_t", "unsigned long", "unsigned long long");
+        TEST_SCANF_NOWARN("%zx", "size_t", "std::size_t");
+        TEST_SCANF_WARN_AKA("%zx", "size_t", "std::ssize_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%zx", "size_t", "std::ptrdiff_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%zx", "size_t", "std::intptr_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%zx", "size_t", "std::uintptr_t", "unsigned long", "unsigned long long");
 
         TEST_SCANF_WARN("%zd", "ssize_t", "bool");
         TEST_SCANF_WARN("%zd", "ssize_t", "signed short");
@@ -1409,12 +1452,33 @@ private:
         TEST_SCANF_WARN_AKA("%tu", "unsigned ptrdiff_t", "std::intptr_t", "signed long", "signed long long");
         TEST_SCANF_WARN_AKA("%tu", "unsigned ptrdiff_t", "std::uintptr_t", "unsigned long", "unsigned long long");
 
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "bool");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "char");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "signed char");
         TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "unsigned char");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "signed short");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "unsigned short");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "signed int");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "unsigned int");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "signed long");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "unsigned long");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "signed long long");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "unsigned long long");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "float");
+        TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "double");
         TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "long double");
         TEST_SCANF_WARN("%tx", "unsigned ptrdiff_t", "void *");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "size_t", "unsigned long", "unsigned long long");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "ssize_t", "signed long", "signed long long");
         TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "ptrdiff_t", "signed long", "signed long long");
-        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "intmax_t", "signed long", "signed long long");
         TEST_SCANF_NOWARN("%tx", "unsigned ptrdiff_t", "unsigned ptrdiff_t");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "intmax_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "uintmax_t", "unsigned long", "unsigned long long");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "std::size_t", "unsigned long", "unsigned long long");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "std::ssize_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "std::ptrdiff_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "std::intptr_t", "signed long", "signed long long");
+        TEST_SCANF_WARN_AKA("%tx", "unsigned ptrdiff_t", "std::uintptr_t", "unsigned long", "unsigned long long");
 
         TEST_SCANF_WARN("%td", "ptrdiff_t", "long double");
         TEST_SCANF_WARN("%td", "ptrdiff_t", "void *");