diff --git a/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/actual.js b/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/actual.js
deleted file mode 100644
index a7c918a617..0000000000
--- a/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/actual.js
+++ /dev/null
@@ -1,3 +0,0 @@
-class Foo {
-  @foo[bar] a = 1;
-}
diff --git a/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/options.json b/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/options.json
deleted file mode 100644
index 68c749fda9..0000000000
--- a/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "plugins": ["decoratorsStage2", "classProperties"],
-  "throws": "Unexpected token (2:12)"
-}
diff --git a/test/fixtures/experimental/decorators-stage-2/no-class-property/actual.js b/test/fixtures/experimental/decorators-stage-2/no-class-property/actual.js
new file mode 100644
index 0000000000..9225da7c2c
--- /dev/null
+++ b/test/fixtures/experimental/decorators-stage-2/no-class-property/actual.js
@@ -0,0 +1,3 @@
+class A {
+  @dec name = 0
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/no-computed-name-prop/options.json b/test/fixtures/experimental/decorators-stage-2/no-class-property/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-computed-name-prop/options.json
rename to test/fixtures/experimental/decorators-stage-2/no-class-property/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/computed-member-expression/actual.js b/test/fixtures/experimental/decorators-stage-2/no-computed-decorator-member/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/computed-member-expression/actual.js
rename to test/fixtures/experimental/decorators-stage-2/no-computed-decorator-member/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/computed-member-expression/options.json b/test/fixtures/experimental/decorators-stage-2/no-computed-decorator-member/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/computed-member-expression/options.json
rename to test/fixtures/experimental/decorators-stage-2/no-computed-decorator-member/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-computed-name-prop/actual.js b/test/fixtures/experimental/decorators-stage-2/no-computed-name-prop/actual.js
deleted file mode 100644
index 4712d930dd..0000000000
--- a/test/fixtures/experimental/decorators-stage-2/no-computed-name-prop/actual.js
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
-  @dec ['name'] = 0
-}
diff --git a/test/fixtures/experimental/decorators-stage-2/no-private-property/actual.js b/test/fixtures/experimental/decorators-stage-2/no-private-property/actual.js
new file mode 100644
index 0000000000..2c1a455e62
--- /dev/null
+++ b/test/fixtures/experimental/decorators-stage-2/no-private-property/actual.js
@@ -0,0 +1,3 @@
+class A {
+  @dec #name = 0
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/no-private-property/options.json b/test/fixtures/experimental/decorators-stage-2/no-private-property/options.json
new file mode 100644
index 0000000000..4f6c7c9e0e
--- /dev/null
+++ b/test/fixtures/experimental/decorators-stage-2/no-private-property/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["classProperties", "classPrivateProperties", "decoratorsStage2"],
+  "throws": "Stage 2 decorators may only be used with a class or a class method (2:7)"
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/no-static-property/actual.js b/test/fixtures/experimental/decorators-stage-2/no-static-property/actual.js
new file mode 100644
index 0000000000..2fcc5057bd
--- /dev/null
+++ b/test/fixtures/experimental/decorators-stage-2/no-static-property/actual.js
@@ -0,0 +1,3 @@
+class A {
+  @dec static name = 0
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/no-static-property/options.json b/test/fixtures/experimental/decorators-stage-2/no-static-property/options.json
new file mode 100644
index 0000000000..a22e3dad04
--- /dev/null
+++ b/test/fixtures/experimental/decorators-stage-2/no-static-property/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["classProperties", "decoratorsStage2"],
+  "throws": "Stage 2 decorators may only be used with a class or a class method (2:7)"
+}