diff --git a/jerry-core/vm/opcodes.c b/jerry-core/vm/opcodes.c
index 7297b9c91..681588f12 100644
--- a/jerry-core/vm/opcodes.c
+++ b/jerry-core/vm/opcodes.c
@@ -1215,6 +1215,7 @@ opfunc_set_class_attributes (ecma_object_t *obj_p, /**< object */
       }
       else if (ECMA_PROPERTY_GET_TYPE (property) == ECMA_PROPERTY_TYPE_NAMEDACCESSOR)
       {
+        property_pair_p->header.types[index] = (uint8_t) (property & ~ECMA_PROPERTY_FLAG_ENUMERABLE);
         ecma_property_value_t *accessor_objs_p = property_pair_p->values + index;
 
         ecma_getter_setter_pointers_t *get_set_pair_p = ecma_get_named_accessor_property (accessor_objs_p);
diff --git a/tests/test262-es6-excludelist.xml b/tests/test262-es6-excludelist.xml
index 6d3788a73..d97a2bb0f 100644
--- a/tests/test262-es6-excludelist.xml
+++ b/tests/test262-es6-excludelist.xml
@@ -344,11 +344,8 @@
   <test id="language/object-literal/getter.js"><reason></reason></test>
   <test id="language/object-literal/method.js"><reason></reason></test>
   <test id="language/object-literal/setter.js"><reason></reason></test>
-  <test id="language/statements/class/definition/accessors.js"><reason></reason></test>
-  <test id="language/statements/class/definition/getters.js"><reason></reason></test>
   <test id="language/statements/class/definition/methods.js"><reason></reason></test>
   <test id="language/statements/class/definition/numeric-property-names.js"><reason></reason></test>
-  <test id="language/statements/class/definition/setters.js"><reason></reason></test>
   <test id="language/statements/class/definition/this-access-restriction.js"><reason></reason></test>
   <test id="language/statements/class/definition/this-check-ordering.js"><reason></reason></test>
   <test id="language/statements/class/name-binding/in-extends-expression-assigned.js"><reason></reason></test>