diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/local-define-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/local-define-property/output.js
index 641307b44d..2315261ebd 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/local-define-property/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/local-define-property/output.js
@@ -1,6 +1,6 @@
 var _class, _descriptor, _descriptor2, _temp;
 
-function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; if (descriptor.initializer) { if (descriptor.set) { descriptor.set.call(context, descriptor.initializer.call(context)); } else { descriptor.value = descriptor.initializer.call(context); } delete descriptor.initializer; } Object.defineProperty(target, property, descriptor); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/loose/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/loose/output.js
index 0a25e2b102..a33c992413 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/loose/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/loose/output.js
@@ -1,6 +1,6 @@
 var _class, _descriptor, _descriptor2, _temp;
 
-function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; if (descriptor.initializer) { if (descriptor.set) { descriptor.set.call(context, descriptor.initializer.call(context)); } else { descriptor.value = descriptor.initializer.call(context); } delete descriptor.initializer; } Object.defineProperty(target, property, descriptor); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/strict/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/strict/output.js
index 11cce4ac92..9f9a5a425f 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/strict/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/strict/output.js
@@ -1,6 +1,6 @@
 var _class, _descriptor, _descriptor2, _temp;
 
-function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; if (descriptor.initializer) { if (descriptor.set) { descriptor.set.call(context, descriptor.initializer.call(context)); } else { descriptor.value = descriptor.initializer.call(context); } delete descriptor.initializer; } Object.defineProperty(target, property, descriptor); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js
index 9a71c17528..e530d6687b 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js
@@ -2,7 +2,7 @@ let _Symbol$search;
 
 var _class, _descriptor, _temp;
 
-function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; if (descriptor.initializer) { if (descriptor.set) { descriptor.set.call(context, descriptor.initializer.call(context)); } else { descriptor.value = descriptor.initializer.call(context); } delete descriptor.initializer; } Object.defineProperty(target, property, descriptor); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }