diff --git a/test/definitions/3.0.0/contact/contact.js b/test/definitions/3.0.0/models/contact/contact.js
similarity index 88%
rename from test/definitions/3.0.0/contact/contact.js
rename to test/definitions/3.0.0/models/contact/contact.js
index 13c37f01..330b2eb2 100644
--- a/test/definitions/3.0.0/contact/contact.js
+++ b/test/definitions/3.0.0/models/contact/contact.js
@@ -13,10 +13,10 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/contact.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/contact.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../definitions/3.0.0/specificationExtension.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/specificationExtension.json'))
   .compile(infoJsonSchema);
 
 describe('Contact', () => {
diff --git a/test/definitions/3.0.0/contact/empty.json b/test/definitions/3.0.0/models/contact/empty.json
similarity index 100%
rename from test/definitions/3.0.0/contact/empty.json
rename to test/definitions/3.0.0/models/contact/empty.json
diff --git a/test/definitions/3.0.0/contact/extended.json b/test/definitions/3.0.0/models/contact/extended.json
similarity index 100%
rename from test/definitions/3.0.0/contact/extended.json
rename to test/definitions/3.0.0/models/contact/extended.json
diff --git a/test/definitions/3.0.0/contact/only required properties.json b/test/definitions/3.0.0/models/contact/only required properties.json
similarity index 100%
rename from test/definitions/3.0.0/contact/only required properties.json
rename to test/definitions/3.0.0/models/contact/only required properties.json
diff --git a/test/definitions/3.0.0/contact/without required properties.json b/test/definitions/3.0.0/models/contact/without required properties.json
similarity index 100%
rename from test/definitions/3.0.0/contact/without required properties.json
rename to test/definitions/3.0.0/models/contact/without required properties.json
diff --git a/test/definitions/3.0.0/contact/wrongly extended.json b/test/definitions/3.0.0/models/contact/wrongly extended.json
similarity index 100%
rename from test/definitions/3.0.0/contact/wrongly extended.json
rename to test/definitions/3.0.0/models/contact/wrongly extended.json
diff --git a/test/definitions/3.0.0/models/index.js b/test/definitions/3.0.0/models/index.js
new file mode 100644
index 00000000..09133f6f
--- /dev/null
+++ b/test/definitions/3.0.0/models/index.js
@@ -0,0 +1,8 @@
+describe('Models', () => {
+  require('./info/info.js');
+  require('./info extensions/info-extension.js');
+  require('./contact/contact.js');
+  require('./license/license.js');
+  require('./reference/reference.js');
+  require('./reference object/reference-object.js');
+});
diff --git a/test/definitions/3.0.0/info extensions/empty.json b/test/definitions/3.0.0/models/info extensions/empty.json
similarity index 100%
rename from test/definitions/3.0.0/info extensions/empty.json
rename to test/definitions/3.0.0/models/info extensions/empty.json
diff --git a/test/definitions/3.0.0/info extensions/extended.json b/test/definitions/3.0.0/models/info extensions/extended.json
similarity index 100%
rename from test/definitions/3.0.0/info extensions/extended.json
rename to test/definitions/3.0.0/models/info extensions/extended.json
diff --git a/test/definitions/3.0.0/info extensions/info-extension.js b/test/definitions/3.0.0/models/info extensions/info-extension.js
similarity index 87%
rename from test/definitions/3.0.0/info extensions/info-extension.js
rename to test/definitions/3.0.0/models/info extensions/info-extension.js
index 0e79c237..c47db6d9 100644
--- a/test/definitions/3.0.0/info extensions/info-extension.js	
+++ b/test/definitions/3.0.0/models/info extensions/info-extension.js	
@@ -13,11 +13,11 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/infoExtensions.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/infoExtensions.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../extensions/linkedin/0.1.0/schema.json'))
-  .addSchema(require('../../../../extensions/x/0.1.0/schema.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../extensions/linkedin/0.1.0/schema.json'))
+  .addSchema(require('../../../../../extensions/x/0.1.0/schema.json'))
   .compile(infoJsonSchema);
 
 describe('InfoExtensions', () => {
diff --git a/test/definitions/3.0.0/info extensions/only required properties.json b/test/definitions/3.0.0/models/info extensions/only required properties.json
similarity index 100%
rename from test/definitions/3.0.0/info extensions/only required properties.json
rename to test/definitions/3.0.0/models/info extensions/only required properties.json
diff --git a/test/definitions/3.0.0/info extensions/without required properties.json b/test/definitions/3.0.0/models/info extensions/without required properties.json
similarity index 100%
rename from test/definitions/3.0.0/info extensions/without required properties.json
rename to test/definitions/3.0.0/models/info extensions/without required properties.json
diff --git a/test/definitions/3.0.0/info extensions/wrongly extended.json b/test/definitions/3.0.0/models/info extensions/wrongly extended.json
similarity index 100%
rename from test/definitions/3.0.0/info extensions/wrongly extended.json
rename to test/definitions/3.0.0/models/info extensions/wrongly extended.json
diff --git a/test/definitions/3.0.0/info/empty.json b/test/definitions/3.0.0/models/info/empty.json
similarity index 100%
rename from test/definitions/3.0.0/info/empty.json
rename to test/definitions/3.0.0/models/info/empty.json
diff --git a/test/definitions/3.0.0/info/extended.json b/test/definitions/3.0.0/models/info/extended.json
similarity index 100%
rename from test/definitions/3.0.0/info/extended.json
rename to test/definitions/3.0.0/models/info/extended.json
diff --git a/test/definitions/3.0.0/info/info.js b/test/definitions/3.0.0/models/info/info.js
similarity index 71%
rename from test/definitions/3.0.0/info/info.js
rename to test/definitions/3.0.0/models/info/info.js
index 86dba3c6..3bfcef46 100644
--- a/test/definitions/3.0.0/info/info.js
+++ b/test/definitions/3.0.0/models/info/info.js
@@ -13,20 +13,20 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/info.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/info.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../definitions/3.0.0/infoExtensions.json'))
-  .addSchema(require('../../../../definitions/3.0.0/contact.json'))
-  .addSchema(require('../../../../definitions/3.0.0/license.json'))
-  .addSchema(require('../../../../examples/3.0.0/ReferenceObject.json'))
-  .addSchema(require('../../../../definitions/3.0.0/ReferenceObject.json'))
-  .addSchema(require('../../../../definitions/3.0.0/Reference.json'))
-  .addSchema(require('../../../../definitions/3.0.0/tag.json'))
-  .addSchema(require('../../../../definitions/3.0.0/externalDocs.json'))
-  .addSchema(require('../../../../definitions/3.0.0/specificationExtension.json'))
-  .addSchema(require('../../../../extensions/linkedin/0.1.0/schema.json'))
-  .addSchema(require('../../../../extensions/x/0.1.0/schema.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/infoExtensions.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/contact.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/license.json'))
+  .addSchema(require('../../../../../examples/3.0.0/ReferenceObject.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/ReferenceObject.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/Reference.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/tag.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/externalDocs.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/specificationExtension.json'))
+  .addSchema(require('../../../../../extensions/linkedin/0.1.0/schema.json'))
+  .addSchema(require('../../../../../extensions/x/0.1.0/schema.json'))
   .compile(infoJsonSchema);
 
 describe('Info', () => {
diff --git a/test/definitions/3.0.0/info/only required properties.json b/test/definitions/3.0.0/models/info/only required properties.json
similarity index 100%
rename from test/definitions/3.0.0/info/only required properties.json
rename to test/definitions/3.0.0/models/info/only required properties.json
diff --git a/test/definitions/3.0.0/info/without required properties.json b/test/definitions/3.0.0/models/info/without required properties.json
similarity index 100%
rename from test/definitions/3.0.0/info/without required properties.json
rename to test/definitions/3.0.0/models/info/without required properties.json
diff --git a/test/definitions/3.0.0/info/wrongly extended.json b/test/definitions/3.0.0/models/info/wrongly extended.json
similarity index 100%
rename from test/definitions/3.0.0/info/wrongly extended.json
rename to test/definitions/3.0.0/models/info/wrongly extended.json
diff --git a/test/definitions/3.0.0/license/empty.json b/test/definitions/3.0.0/models/license/empty.json
similarity index 100%
rename from test/definitions/3.0.0/license/empty.json
rename to test/definitions/3.0.0/models/license/empty.json
diff --git a/test/definitions/3.0.0/license/extended.json b/test/definitions/3.0.0/models/license/extended.json
similarity index 100%
rename from test/definitions/3.0.0/license/extended.json
rename to test/definitions/3.0.0/models/license/extended.json
diff --git a/test/definitions/3.0.0/license/license.js b/test/definitions/3.0.0/models/license/license.js
similarity index 89%
rename from test/definitions/3.0.0/license/license.js
rename to test/definitions/3.0.0/models/license/license.js
index 4f7e3251..34e08600 100644
--- a/test/definitions/3.0.0/license/license.js
+++ b/test/definitions/3.0.0/models/license/license.js
@@ -13,10 +13,10 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/license.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/license.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../definitions/3.0.0/specificationExtension.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/specificationExtension.json'))
   .compile(infoJsonSchema);
 
 describe('License', () => {
diff --git a/test/definitions/3.0.0/license/only required properties.json b/test/definitions/3.0.0/models/license/only required properties.json
similarity index 100%
rename from test/definitions/3.0.0/license/only required properties.json
rename to test/definitions/3.0.0/models/license/only required properties.json
diff --git a/test/definitions/3.0.0/license/without required properties.json b/test/definitions/3.0.0/models/license/without required properties.json
similarity index 100%
rename from test/definitions/3.0.0/license/without required properties.json
rename to test/definitions/3.0.0/models/license/without required properties.json
diff --git a/test/definitions/3.0.0/license/wrongly extended.json b/test/definitions/3.0.0/models/license/wrongly extended.json
similarity index 100%
rename from test/definitions/3.0.0/license/wrongly extended.json
rename to test/definitions/3.0.0/models/license/wrongly extended.json
diff --git a/test/definitions/3.0.0/reference object/array.json b/test/definitions/3.0.0/models/reference object/array.json
similarity index 100%
rename from test/definitions/3.0.0/reference object/array.json
rename to test/definitions/3.0.0/models/reference object/array.json
diff --git a/test/definitions/3.0.0/reference object/boolean.json b/test/definitions/3.0.0/models/reference object/boolean.json
similarity index 100%
rename from test/definitions/3.0.0/reference object/boolean.json
rename to test/definitions/3.0.0/models/reference object/boolean.json
diff --git a/test/definitions/3.0.0/reference object/empty.json b/test/definitions/3.0.0/models/reference object/empty.json
similarity index 100%
rename from test/definitions/3.0.0/reference object/empty.json
rename to test/definitions/3.0.0/models/reference object/empty.json
diff --git a/test/definitions/3.0.0/reference object/null.json b/test/definitions/3.0.0/models/reference object/null.json
similarity index 100%
rename from test/definitions/3.0.0/reference object/null.json
rename to test/definitions/3.0.0/models/reference object/null.json
diff --git a/test/definitions/3.0.0/reference object/number.json b/test/definitions/3.0.0/models/reference object/number.json
similarity index 100%
rename from test/definitions/3.0.0/reference object/number.json
rename to test/definitions/3.0.0/models/reference object/number.json
diff --git a/test/definitions/3.0.0/reference object/object.json b/test/definitions/3.0.0/models/reference object/object.json
similarity index 100%
rename from test/definitions/3.0.0/reference object/object.json
rename to test/definitions/3.0.0/models/reference object/object.json
diff --git a/test/definitions/3.0.0/reference object/reference-object.js b/test/definitions/3.0.0/models/reference object/reference-object.js
similarity index 92%
rename from test/definitions/3.0.0/reference object/reference-object.js
rename to test/definitions/3.0.0/models/reference object/reference-object.js
index 8fdab5dc..153145d1 100644
--- a/test/definitions/3.0.0/reference object/reference-object.js	
+++ b/test/definitions/3.0.0/models/reference object/reference-object.js	
@@ -13,10 +13,10 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/Reference.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/Reference.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addMetaSchema(require('../../../../definitions/3.0.0/ReferenceObject.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/ReferenceObject.json'))
   .compile(infoJsonSchema);
 
 describe('ReferenceObject', () => {
diff --git a/test/definitions/3.0.0/reference object/string.json b/test/definitions/3.0.0/models/reference object/string.json
similarity index 100%
rename from test/definitions/3.0.0/reference object/string.json
rename to test/definitions/3.0.0/models/reference object/string.json
diff --git a/test/definitions/3.0.0/reference object/uri.json b/test/definitions/3.0.0/models/reference object/uri.json
similarity index 100%
rename from test/definitions/3.0.0/reference object/uri.json
rename to test/definitions/3.0.0/models/reference object/uri.json
diff --git a/test/definitions/3.0.0/reference/empty.json b/test/definitions/3.0.0/models/reference/empty.json
similarity index 100%
rename from test/definitions/3.0.0/reference/empty.json
rename to test/definitions/3.0.0/models/reference/empty.json
diff --git a/test/definitions/3.0.0/reference/extended.json b/test/definitions/3.0.0/models/reference/extended.json
similarity index 100%
rename from test/definitions/3.0.0/reference/extended.json
rename to test/definitions/3.0.0/models/reference/extended.json
diff --git a/test/definitions/3.0.0/reference/only required properties.json b/test/definitions/3.0.0/models/reference/only required properties.json
similarity index 100%
rename from test/definitions/3.0.0/reference/only required properties.json
rename to test/definitions/3.0.0/models/reference/only required properties.json
diff --git a/test/definitions/3.0.0/reference/reference.js b/test/definitions/3.0.0/models/reference/reference.js
similarity index 89%
rename from test/definitions/3.0.0/reference/reference.js
rename to test/definitions/3.0.0/models/reference/reference.js
index e4db6e2c..5823f39e 100644
--- a/test/definitions/3.0.0/reference/reference.js
+++ b/test/definitions/3.0.0/models/reference/reference.js
@@ -13,10 +13,10 @@ const ajv = new Ajv({
 });
 addFormats(ajv);
 
-const infoJsonSchema = require('../../../../definitions/3.0.0/Reference.json');
+const infoJsonSchema = require('../../../../../definitions/3.0.0/Reference.json');
 const validator = ajv
-  .addMetaSchema(require('../../../../definitions/3.0.0/schema.json'))
-  .addSchema(require('../../../../definitions/3.0.0/ReferenceObject.json'))
+  .addMetaSchema(require('../../../../../definitions/3.0.0/schema.json'))
+  .addSchema(require('../../../../../definitions/3.0.0/ReferenceObject.json'))
   .compile(infoJsonSchema);
 
 describe('Reference', () => {
diff --git a/test/definitions/3.0.0/reference/without required properties.json b/test/definitions/3.0.0/models/reference/without required properties.json
similarity index 100%
rename from test/definitions/3.0.0/reference/without required properties.json
rename to test/definitions/3.0.0/models/reference/without required properties.json
diff --git a/test/definitions/3.0.0/reference/wrongly extended.json b/test/definitions/3.0.0/models/reference/wrongly extended.json
similarity index 100%
rename from test/definitions/3.0.0/reference/wrongly extended.json
rename to test/definitions/3.0.0/models/reference/wrongly extended.json
diff --git a/test/index.js b/test/index.js
index c1845357..1e20314f 100644
--- a/test/index.js
+++ b/test/index.js
@@ -3,14 +3,8 @@ const fs = require('fs');
 const path = require('path');
 
 describe('AsyncAPI: 3.0.0', () => {
-  require('./definitions/3.0.0/info/info.js');
-  require('./definitions/3.0.0/info extensions/info-extension.js');
-  require('./definitions/3.0.0/contact/contact.js');
-  require('./definitions/3.0.0/license/license.js');
-  require('./definitions/3.0.0/reference/reference.js');
-  require('./definitions/3.0.0/reference object/reference-object.js');
-
-  require('./definitions/3.0.0/security/index.js');
+  require('./definitions/3.0.0/models');
+  require('./definitions/3.0.0/security');
 });
 
 describe('AsyncAPI', () => {