diff --git a/packages/core/content-type-builder/server/services/schema-builder/schema-handler.js b/packages/core/content-type-builder/server/services/schema-builder/schema-handler.js
index 22b23aff54..da057ed7ad 100644
--- a/packages/core/content-type-builder/server/services/schema-builder/schema-handler.js
+++ b/packages/core/content-type-builder/server/services/schema-builder/schema-handler.js
@@ -130,7 +130,7 @@ module.exports = function createSchemaHandler(infos) {
       }
 
       // set new Attributes
-      for (const key in newAttributes) {
+      for (const key of Object.keys(newAttributes)) {
         this.setAttribute(key, newAttributes[key]);
       }
 
diff --git a/packages/core/content-type-builder/tests/single-type.test.e2e.js b/packages/core/content-type-builder/tests/single-type.test.e2e.js
index b6c9263bb8..dbc8c2e2ba 100644
--- a/packages/core/content-type-builder/tests/single-type.test.e2e.js
+++ b/packages/core/content-type-builder/tests/single-type.test.e2e.js
@@ -157,7 +157,7 @@ describe('Content Type Builder - Content types', () => {
       const { uid } = createRes.body.data;
 
       // create data
-      for (let i = 0; i < 2; i++) {
+      for (let i = 0; i < 2; i += 1) {
         await strapi.query(uid).create({ data: { title: 'Test' } });
       }