diff --git a/test/fixtures/experimental/uncategorised/34/actual.js b/test/fixtures/experimental/decorators/class-decorator-assignment/actual.js
similarity index 100%
rename from test/fixtures/experimental/uncategorised/34/actual.js
rename to test/fixtures/experimental/decorators/class-decorator-assignment/actual.js
diff --git a/test/fixtures/experimental/uncategorised/34/expected.json b/test/fixtures/experimental/decorators/class-decorator-assignment/expected.json
similarity index 100%
rename from test/fixtures/experimental/uncategorised/34/expected.json
rename to test/fixtures/experimental/decorators/class-decorator-assignment/expected.json
diff --git a/test/fixtures/experimental/uncategorised/37/actual.js b/test/fixtures/experimental/decorators/class-decorator-getter/actual.js
similarity index 100%
rename from test/fixtures/experimental/uncategorised/37/actual.js
rename to test/fixtures/experimental/decorators/class-decorator-getter/actual.js
diff --git a/test/fixtures/experimental/uncategorised/37/expected.json b/test/fixtures/experimental/decorators/class-decorator-getter/expected.json
similarity index 100%
rename from test/fixtures/experimental/uncategorised/37/expected.json
rename to test/fixtures/experimental/decorators/class-decorator-getter/expected.json
diff --git a/test/fixtures/experimental/uncategorised/33/actual.js b/test/fixtures/experimental/decorators/class-decorator-same-line/actual.js
similarity index 100%
rename from test/fixtures/experimental/uncategorised/33/actual.js
rename to test/fixtures/experimental/decorators/class-decorator-same-line/actual.js
diff --git a/test/fixtures/experimental/uncategorised/33/expected.json b/test/fixtures/experimental/decorators/class-decorator-same-line/expected.json
similarity index 100%
rename from test/fixtures/experimental/uncategorised/33/expected.json
rename to test/fixtures/experimental/decorators/class-decorator-same-line/expected.json
diff --git a/test/fixtures/experimental/uncategorised/36/actual.js b/test/fixtures/experimental/decorators/class-decorator-setter/actual.js
similarity index 100%
rename from test/fixtures/experimental/uncategorised/36/actual.js
rename to test/fixtures/experimental/decorators/class-decorator-setter/actual.js
diff --git a/test/fixtures/experimental/uncategorised/36/expected.json b/test/fixtures/experimental/decorators/class-decorator-setter/expected.json
similarity index 100%
rename from test/fixtures/experimental/uncategorised/36/expected.json
rename to test/fixtures/experimental/decorators/class-decorator-setter/expected.json
diff --git a/test/fixtures/experimental/uncategorised/38/actual.js b/test/fixtures/experimental/decorators/class-decorators-multiple/actual.js
similarity index 100%
rename from test/fixtures/experimental/uncategorised/38/actual.js
rename to test/fixtures/experimental/decorators/class-decorators-multiple/actual.js
diff --git a/test/fixtures/experimental/uncategorised/38/expected.json b/test/fixtures/experimental/decorators/class-decorators-multiple/expected.json
similarity index 100%
rename from test/fixtures/experimental/uncategorised/38/expected.json
rename to test/fixtures/experimental/decorators/class-decorators-multiple/expected.json
diff --git a/test/fixtures/experimental/uncategorised/35/actual.js b/test/fixtures/experimental/decorators/method-decorator/actual.js
similarity index 100%
rename from test/fixtures/experimental/uncategorised/35/actual.js
rename to test/fixtures/experimental/decorators/method-decorator/actual.js
diff --git a/test/fixtures/experimental/uncategorised/35/expected.json b/test/fixtures/experimental/decorators/method-decorator/expected.json
similarity index 100%
rename from test/fixtures/experimental/uncategorised/35/expected.json
rename to test/fixtures/experimental/decorators/method-decorator/expected.json
diff --git a/test/fixtures/experimental/uncategorised/39/actual.js b/test/fixtures/experimental/decorators/object-decorator/actual.js
similarity index 100%
rename from test/fixtures/experimental/uncategorised/39/actual.js
rename to test/fixtures/experimental/decorators/object-decorator/actual.js
diff --git a/test/fixtures/experimental/uncategorised/39/expected.json b/test/fixtures/experimental/decorators/object-decorator/expected.json
similarity index 100%
rename from test/fixtures/experimental/uncategorised/39/expected.json
rename to test/fixtures/experimental/decorators/object-decorator/expected.json
diff --git a/test/fixtures/experimental/uncategorised/33/options.json b/test/fixtures/experimental/uncategorised/33/options.json
deleted file mode 100644
index d760b0afda..0000000000
--- a/test/fixtures/experimental/uncategorised/33/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["decorators"]
-}
diff --git a/test/fixtures/experimental/uncategorised/34/options.json b/test/fixtures/experimental/uncategorised/34/options.json
deleted file mode 100644
index d760b0afda..0000000000
--- a/test/fixtures/experimental/uncategorised/34/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["decorators"]
-}
diff --git a/test/fixtures/experimental/uncategorised/35/options.json b/test/fixtures/experimental/uncategorised/35/options.json
deleted file mode 100644
index d760b0afda..0000000000
--- a/test/fixtures/experimental/uncategorised/35/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["decorators"]
-}
diff --git a/test/fixtures/experimental/uncategorised/36/options.json b/test/fixtures/experimental/uncategorised/36/options.json
deleted file mode 100644
index d760b0afda..0000000000
--- a/test/fixtures/experimental/uncategorised/36/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["decorators"]
-}
diff --git a/test/fixtures/experimental/uncategorised/37/options.json b/test/fixtures/experimental/uncategorised/37/options.json
deleted file mode 100644
index d760b0afda..0000000000
--- a/test/fixtures/experimental/uncategorised/37/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["decorators"]
-}
diff --git a/test/fixtures/experimental/uncategorised/38/options.json b/test/fixtures/experimental/uncategorised/38/options.json
deleted file mode 100644
index d760b0afda..0000000000
--- a/test/fixtures/experimental/uncategorised/38/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["decorators"]
-}
diff --git a/test/fixtures/experimental/uncategorised/39/options.json b/test/fixtures/experimental/uncategorised/39/options.json
deleted file mode 100644
index d760b0afda..0000000000
--- a/test/fixtures/experimental/uncategorised/39/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["decorators"]
-}