diff --git a/autotests/folding/highlight.cmake.fold b/autotests/folding/highlight.cmake.fold
--- a/autotests/folding/highlight.cmake.fold
+++ b/autotests/folding/highlight.cmake.fold
@@ -109,3 +109,25 @@
       )
 
 endif()
+
+# In each function call below, all 3 named parameter lines should apply the same highlighting.
+add_custom_command(
+    COMMAND true
+    COMMAND (true)
+    COMMAND true
+)
+add_custom_target(TargetName
+    WORKING_DIRECTORY somedir
+    COMMAND (true)
+    BYPRODUCTS somefile
+)
+execute_process(
+    COMMAND true
+    COMMAND (true)
+    COMMAND true
+)
+add_test(
+    NAME sometest
+    COMMAND (true)
+    WORKING_DIRECTORY somedir
+)
diff --git a/html/highlight.cmake.html b/autotests/html/highlight.cmake.html
rename from html/highlight.cmake.html
rename to autotests/html/highlight.cmake.html
diff --git a/input/highlight.cmake b/autotests/input/highlight.cmake
rename from input/highlight.cmake
rename to autotests/input/highlight.cmake
diff --git a/reference/highlight.cmake.ref b/autotests/reference/highlight.cmake.ref
rename from reference/highlight.cmake.ref
rename to autotests/reference/highlight.cmake.ref
diff --git a/generators/cmake.xml.tpl b/data/generators/cmake.xml.tpl
rename from generators/cmake.xml.tpl
rename to data/generators/cmake.xml.tpl
diff --git a/generators/cmake.yaml b/data/generators/cmake.yaml
rename from generators/cmake.yaml
rename to data/generators/cmake.yaml