diff --git a/Makefile b/Makefile
index 69a599216c..42683032f1 100644
--- a/Makefile
+++ b/Makefile
@@ -345,7 +345,7 @@ pylint: reports
 	@(set -o pipefail && $@ | reports/$@.report)
 
 genschema: reports
-	$(MAKE) swagger PYTEST_ARGS="--genschema"
+	$(MAKE) swagger PYTEST_ARGS="--genschema --create-db "
 	mv swagger.json schema.json
 
 swagger: reports
diff --git a/awx/main/tests/docs/test_swagger_generation.py b/awx/main/tests/docs/test_swagger_generation.py
index 287b4d0ad1..9f00193515 100644
--- a/awx/main/tests/docs/test_swagger_generation.py
+++ b/awx/main/tests/docs/test_swagger_generation.py
@@ -176,4 +176,9 @@ class TestSwaggerGeneration():
                 r'\1xxxx\3',
                 data
             )
+            data = re.sub(
+                r'"action_node": "awx-[^"]+"',
+                '"action_node": "awx"',
+                data
+            )
             f.write(data)