diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/history/.categories b/lldb/packages/Python/lldbsuite/test/commands/command/.categories
similarity index 100%
rename from lldb/packages/Python/lldbsuite/test/commands/command/history/.categories
rename to lldb/packages/Python/lldbsuite/test/commands/command/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/.categories b/lldb/packages/Python/lldbsuite/test/commands/command/script/.categories
deleted file mode 100644
index 3a3f4df6416b9c..00000000000000
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script/.categories
+++ /dev/null
@@ -1 +0,0 @@
-cmdline
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/.categories b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/.categories
deleted file mode 100644
index 3a3f4df6416b9c..00000000000000
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/.categories
+++ /dev/null
@@ -1 +0,0 @@
-cmdline
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/source/.categories b/lldb/packages/Python/lldbsuite/test/commands/command/source/.categories
deleted file mode 100644
index 3a3f4df6416b9c..00000000000000
--- a/lldb/packages/Python/lldbsuite/test/commands/command/source/.categories
+++ /dev/null
@@ -1 +0,0 @@
-cmdline
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/.categories b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/.categories
deleted file mode 100644
index 897e40a99dda06..00000000000000
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/.categories
+++ /dev/null
@@ -1 +0,0 @@
-expression
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/.categories
index 6326dbcec91bcc..72cf07c1efeaeb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/.categories
@@ -1 +1 @@
-dataformatters,objc
+objc