diff --git a/apps/silverback-drupal/generated/__tests__/extra/extraField.gql b/apps/silverback-drupal/generated/__tests__/queries/extra/extraField.gql
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/extra/extraField.gql
rename to apps/silverback-drupal/generated/__tests__/queries/extra/extraField.gql
diff --git a/apps/silverback-drupal/generated/__tests__/extra/extraField.gql.snap b/apps/silverback-drupal/generated/__tests__/queries/extra/extraField.gql.snapshot
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/extra/extraField.gql.snap
rename to apps/silverback-drupal/generated/__tests__/queries/extra/extraField.gql.snapshot
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/Image.gql b/apps/silverback-drupal/generated/__tests__/queries/gatsby/Image.gql
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/Image.gql
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/Image.gql
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/Image.gql.snap b/apps/silverback-drupal/generated/__tests__/queries/gatsby/Image.gql.snapshot
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/Image.gql.snap
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/Image.gql.snapshot
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/MenuItem.gql b/apps/silverback-drupal/generated/__tests__/queries/gatsby/MenuItem.gql
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/MenuItem.gql
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/MenuItem.gql
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/MenuItem.gql.snap b/apps/silverback-drupal/generated/__tests__/queries/gatsby/MenuItem.gql.snapshot
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/MenuItem.gql.snap
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/MenuItem.gql.snapshot
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/Webform.gql b/apps/silverback-drupal/generated/__tests__/queries/gatsby/Webform.gql
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/Webform.gql
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/Webform.gql
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/Webform.gql.snap b/apps/silverback-drupal/generated/__tests__/queries/gatsby/Webform.gql.snapshot
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/Webform.gql.snap
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/Webform.gql.snapshot
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/content/Article.gql b/apps/silverback-drupal/generated/__tests__/queries/gatsby/content/Article.gql
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/content/Article.gql
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/content/Article.gql
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/content/Article.gql.snap b/apps/silverback-drupal/generated/__tests__/queries/gatsby/content/Article.gql.snapshot
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/content/Article.gql.snap
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/content/Article.gql.snapshot
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/content/GutenbergPage.gql b/apps/silverback-drupal/generated/__tests__/queries/gatsby/content/GutenbergPage.gql
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/content/GutenbergPage.gql
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/content/GutenbergPage.gql
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/content/GutenbergPage.gql.snap b/apps/silverback-drupal/generated/__tests__/queries/gatsby/content/GutenbergPage.gql.snapshot
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/content/GutenbergPage.gql.snap
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/content/GutenbergPage.gql.snapshot
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/content/Page.gql b/apps/silverback-drupal/generated/__tests__/queries/gatsby/content/Page.gql
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/content/Page.gql
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/content/Page.gql
diff --git a/apps/silverback-drupal/generated/__tests__/gatsby/content/Page.gql.snap b/apps/silverback-drupal/generated/__tests__/queries/gatsby/content/Page.gql.snapshot
similarity index 100%
rename from apps/silverback-drupal/generated/__tests__/gatsby/content/Page.gql.snap
rename to apps/silverback-drupal/generated/__tests__/queries/gatsby/content/Page.gql.snapshot
diff --git a/apps/silverback-drupal/generated/serializer.js b/apps/silverback-drupal/generated/__tests__/test-queries.js
similarity index 53%
rename from apps/silverback-drupal/generated/serializer.js
rename to apps/silverback-drupal/generated/__tests__/test-queries.js
index d0c9df34c..1990867f2 100644
--- a/apps/silverback-drupal/generated/serializer.js
+++ b/apps/silverback-drupal/generated/__tests__/test-queries.js
@@ -1,9 +1,16 @@
-module.exports = {
-  default(responses) {
-    maskImageUrl(responses);
-    return responses;
-  },
-};
+const path = require("path");
+const {
+  listFiles,
+  createExecutor,
+} = require("@amazeelabs/graphql-schema-test");
+
+const graphQlConfigPath = path.resolve(__dirname, "../.graphqlconfig");
+const queriesPath = path.resolve(__dirname, "queries");
+
+execute = createExecutor(graphQlConfigPath, maskImageUrl);
+test.each(listFiles(queriesPath))("%s", async (_, path) => {
+  await execute(path);
+});
 
 // Image URLs contain current date, e.g.
 // http://localhost:8888/sites/default/files/2021-01/image.jpg
diff --git a/apps/silverback-drupal/package.json b/apps/silverback-drupal/package.json
index 953697cd2..6ff0b6cf5 100644
--- a/apps/silverback-drupal/package.json
+++ b/apps/silverback-drupal/package.json
@@ -6,14 +6,15 @@
   "scripts": {
     "prepare": "if php -v && [[ -z $LAGOON ]]; then composer install && yarn setup && yarn snapshot-create && source .envrc && drush silverback-gatsby:schema-export; fi",
     "start": "source .envrc && cd web && php -S 127.0.0.1:8888 .ht.router.php",
+    "start:silent": "yarn start > /tmp/drupal.log 2>&1",
     "login": "source .envrc && drush uli",
     "setup": "source .envrc && silverback setup",
     "snapshot-create": "source .envrc && silverback snapshot-create test -y",
     "snapshot-restore": "source .envrc && silverback snapshot-restore test",
     "clear": "source .envrc && drush cr",
     "test": "composer install && bash vendor/bin/silverback-test",
-    "test:integration": "yarn snapshot-restore && start-server-and-test start 8888 test:schema",
-    "test:schema": "yarn graphql-schema-test generated",
+    "test:integration": "yarn snapshot-restore && start-server-and-test start:silent 8888 test:schema",
+    "test:schema": "yarn jest --testMatch '<rootDir>/generated/__tests__/test-queries.js'",
     "export-content": "web/modules/custom/silverback_gatsby_test/export_content.sh"
   },
   "dependencies": {
@@ -26,6 +27,7 @@
   },
   "devDependencies": {
     "@amazeelabs/graphql-schema-test": "^1.0.4",
+    "jest": "^27.4.7",
     "start-server-and-test": "^1.14.0"
   }
 }