diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 054b14dbd0d..1f2ec5c5b2c 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -6285,6 +6285,7 @@ std::string Tokenizer::dumpTypedefInfo() const
     std::string outs = "  <typedef-info>";
     outs += '\n';
     for (const TypedefInfo &typedefInfo: mTypedefInfo) {
+        const bool toks = !typedefInfo.typedefInfoTokens.empty();
         outs += "    <info";
 
         outs += " name=\"";
@@ -6310,8 +6311,10 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += " isFunctionPointer=\"";
         outs += std::to_string(typedefInfo.isFunctionPointer);
         outs += "\"";
-
-        outs += "/>";
+        if (toks)
+            outs += ">";
+        else
+            outs += "/>";
         outs += '\n';
         for (const auto& t : typedefInfo.typedefInfoTokens) {
             outs += "      <token ";
@@ -6323,6 +6326,8 @@ std::string Tokenizer::dumpTypedefInfo() const
             outs += "\"/>";
             outs += '\n';
         }
+        if (toks)
+            outs += "    </info>\n";
     }
     outs += "  </typedef-info>";
     outs += '\n';
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index 1f2701043bb..b13a0113b9e 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -4556,7 +4556,7 @@ class TestSimplifyTypedef : public TestFixture {
                                                 "   typedef fp16 ( *pfp16 ) ( void );\n"
                                                 "}\n");
         ASSERT_EQUALS("  <typedef-info>\n"
-                      "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"1\" used=\"1\" isFunctionPointer=\"1\"/>\n"
+                      "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"1\" used=\"1\" isFunctionPointer=\"1\">\n"
                       "      <token column=\"1\" str=\"typedef\"/>\n"
                       "      <token column=\"9\" str=\"void\"/>\n"
                       "      <token column=\"14\" str=\"(\"/>\n"
@@ -4567,8 +4567,9 @@ class TestSimplifyTypedef : public TestFixture {
                       "      <token column=\"25\" str=\"int16_t\"/>\n"
                       "      <token column=\"33\" str=\"n\"/>\n"
                       "      <token column=\"35\" str=\")\"/>\n"
+                      "    </info>\n"
                       "    <info name=\"int16_t\" file=\"file.c\" line=\"1\" column=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
-                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"20\" used=\"0\" isFunctionPointer=\"1\"/>\n"
+                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"20\" used=\"0\" isFunctionPointer=\"1\">\n"
                       "      <token column=\"4\" str=\"typedef\"/>\n"
                       "      <token column=\"12\" str=\"void\"/>\n"
                       "      <token column=\"12\" str=\"(\"/>\n"
@@ -4586,6 +4587,7 @@ class TestSimplifyTypedef : public TestFixture {
                       "      <token column=\"35\" str=\"short\"/>\n"
                       "      <token column=\"35\" str=\"n\"/>\n"
                       "      <token column=\"35\" str=\")\"/>\n"
+                      "    </info>\n"
                       "  </typedef-info>\n",xml);
     }