diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
new file mode 100644
index 0000000..465271d
--- /dev/null
+++ b/.github/workflows/check.yaml
@@ -0,0 +1,42 @@
+name: Check
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 'v[0-9]*.[0-9]*.x'
+
+jobs:
+  Test:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Check out codebase
+        uses: actions/checkout@v2
+
+      - name: Install nix
+        uses: cachix/install-nix-action@v12
+        with:
+          nix_path: nixpkgs=channel:nixos-20.09
+
+      - name: Build
+        run: nix-shell --run 'make build'
+
+      - name: Test
+        run: nix-shell --run 'make test-code'
+
+  Validate_Format:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Check out codebase
+        uses: actions/checkout@v2
+
+      - name: Install nix
+        uses: cachix/install-nix-action@v12
+        with:
+          nix_path: nixpkgs=channel:nixos-20.09
+
+      - name: Validate Format
+        run: nix-shell --run 'make test-format'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
deleted file mode 100644
index d067ab9..0000000
--- a/.github/workflows/test.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Test
-
-on:
-  pull_request:
-  push:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Check out codebase
-        uses: actions/checkout@v2
-
-      - name: Install nix
-        uses: cachix/install-nix-action@v12
-        with:
-          nix_path: nixpkgs=channel:nixos-20.09
-
-      - name: Build
-        run: nix-shell --run 'make build'
-
-      - name: Test
-        run: nix-shell --run 'make test-code'
diff --git a/.github/workflows/validate-formatting.yaml b/.github/workflows/validate-formatting.yaml
deleted file mode 100644
index 0965a1e..0000000
--- a/.github/workflows/validate-formatting.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Validate Formatting
-
-on:
-  pull_request:
-  push:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Check out codebase
-        uses: actions/checkout@v2
-
-      - name: Install nix
-        uses: cachix/install-nix-action@v12
-        with:
-          nix_path: nixpkgs=channel:nixos-20.09
-
-      - name: Build
-        run: nix-shell --run 'make build'
-
-      - name: Test
-        run: nix-shell --run 'make test-format'
diff --git a/Readme.md b/Readme.md
index 05fa2f3..8732d4f 100644
--- a/Readme.md
+++ b/Readme.md
@@ -2,7 +2,6 @@
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/cprussin/purescript-httpure/master/License)
 [![Latest release](http://img.shields.io/github/release/cprussin/purescript-httpure.svg)](https://github.com/cprussin/purescript-httpure/releases)
-[![Build Status](https://github.com/cprussin/purescript-httpure/actions/workflows/test.yaml/badge.svg)](https://github.com/cprussin/purescript-httpure/actions/workflows/test.yaml)
 [![purescript-httpure on Pursuit](https://pursuit.purescript.org/packages/purescript-httpure/badge)](https://pursuit.purescript.org/packages/purescript-httpure)
 
 A purescript HTTP server framework.