diff --git a/.circleci/config.yml b/.circleci/config.yml
index f1edcc7f..9affa0f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,11 +12,14 @@ jobs:
           name: Test
           command: swift test 2>&1 | xcpretty
       - run:
-          name: Check Project Diff
-          command: ./diff-fixtures.sh
+          name: Generate Fixtures
+          command: scripts/gen-fixtures.sh
       - run:
-          name: Build Test Project
-          command: ./build-fixtures.sh
+          name: Check Fixture Diffs
+          command: scripts/diff-fixtures.sh
+      - run:
+          name: Build Fixtures
+          command: scripts/build-fixtures.sh
       - run:
           name: Build release
           command: make build
diff --git a/build-fixtures.sh b/build-fixtures.sh
deleted file mode 100755
index f13a3ae5..00000000
--- a/build-fixtures.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-
-swift run xcodegen --spec Tests/Fixtures/TestProject/project.yml
-cd Tests/Fixtures/TestProject
-./build.sh
diff --git a/scripts/build-fixtures.sh b/scripts/build-fixtures.sh
new file mode 100755
index 00000000..f5ca8ebe
--- /dev/null
+++ b/scripts/build-fixtures.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+cd Tests/Fixtures/TestProject
+./build.sh
diff --git a/diff-fixtures.sh b/scripts/diff-fixtures.sh
similarity index 100%
rename from diff-fixtures.sh
rename to scripts/diff-fixtures.sh
diff --git a/scripts/gen_fixtures.sh b/scripts/gen-fixtures.sh
similarity index 76%
rename from scripts/gen_fixtures.sh
rename to scripts/gen-fixtures.sh
index 428d236e..3d77d567 100755
--- a/scripts/gen_fixtures.sh
+++ b/scripts/gen-fixtures.sh
@@ -1 +1,4 @@
+#!/bin/bash
+set -e
+
 swift run xcodegen --spec Tests/Fixtures/TestProject/project.yml