3 files changed, 22 insertions, 0 deletions
diff --git a/tests/unit/unittest/conditionally-disabled-tests.h b/tests/unit/unittest/conditionally-disabled-tests.h
index 8f55db10d7a..3cac7591352 100644
--- a/tests/unit/unittest/conditionally-disabled-tests.h
+++ b/tests/unit/unittest/conditionally-disabled-tests.h
@@ -39,3 +39,9 @@
 #else
 #  define DISABLED_WITHOUT_PRETTYDECL_PATCH(x) DISABLED_##x
 #endif
+
+#ifdef IS_INVALIDDECL_SUPPORTED
+#  define DISABLED_WITHOUT_INVALIDDECL_PATCH(x) x
+#else
+#  define DISABLED_WITHOUT_INVALIDDECL_PATCH(x) DISABLED_##x
+#endif
diff --git a/tests/unit/unittest/data/highlightingmarks.cpp b/tests/unit/unittest/data/highlightingmarks.cpp
index 83df72fa101..afe4d8a0f1e 100644
--- a/tests/unit/unittest/data/highlightingmarks.cpp
+++ b/tests/unit/unittest/data/highlightingmarks.cpp
@@ -588,3 +588,5 @@ void BaseClass::VirtualFunction() {}
 class WithVirtualFunctionDefined {
   virtual void VirtualFunctionDefinition() {};
 };
+
+Undeclared u;
diff --git a/tests/unit/unittest/tokeninfos-test.cpp b/tests/unit/unittest/tokeninfos-test.cpp
index 0d9b34f4b67..d3e249c3291 100644
--- a/tests/unit/unittest/tokeninfos-test.cpp
+++ b/tests/unit/unittest/tokeninfos-test.cpp
@@ -1246,6 +1246,20 @@ TEST_F(TokenInfos, DefineIsNotIdentifier)
     ASSERT_THAT(container.isIncludeDirectivePath(), false);
 }
 
+TEST_F(TokenInfos, DISABLED_WITHOUT_INVALIDDECL_PATCH(TypeNameOfInvalidDeclarationIsInvalid))
+{
+    const auto infos = translationUnit.tokenInfosInRange(sourceRange(592, 14));
+
+    ASSERT_THAT(infos[0], HasOnlyType(HighlightingType::Invalid));
+}
+
+TEST_F(TokenInfos, DISABLED_WITHOUT_INVALIDDECL_PATCH(VariableNameOfInvalidDeclarationIsInvalid))
+{
+    const auto infos = translationUnit.tokenInfosInRange(sourceRange(592, 14));
+
+    ASSERT_THAT(infos[1], HasOnlyType(HighlightingType::Invalid));
+}
+
 Data *TokenInfos::d;
 
 void TokenInfos::SetUpTestCase()