diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
deleted file mode 100644
index ba6976b..0000000
--- a/.github/workflows/rust.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-on: [push, pull_request]
-
-name: ci
-
-jobs:
-  build_macos:
-    name: build on macos
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release
-
-  build_and_test:
-    name: build and test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: check
-        run: cargo check 
-      - name: clippy
-        run: cargo clippy
-      - name: test
-        run: cargo test 
-      - name: build
-        run: cargo build --release
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..b795668
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,72 @@
+on: 
+  push:
+    branches: [master]
+  pull_request:
+    branches: ["*"]
+
+name: Run Tests
+
+jobs:
+  test_macos:
+    name: Run Tests on macOS
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo build
+        uses: actions/cache@v1
+        with:
+          path: target
+          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+      - name: Setup toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - name: check
+        run: cargo check 
+      - name: clippy
+        run: cargo clippy
+      - name: test
+        run: cargo test 
+      - name: build
+        run: cargo build --release
+
+  test_ubuntu:
+    name: Run Tests on Ubuntu (x86_64)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo build
+        uses: actions/cache@v1
+        with:
+          path: target
+          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+      - name: check
+        run: cargo check 
+      - name: clippy
+        run: cargo clippy
+      - name: test
+        run: cargo test 
+      - name: build
+        run: cargo build --release