diff --git a/.github/workflows/build_and_test.sh b/.github/workflows/build_and_test.sh
deleted file mode 100755
index c8f3d6eb1100..000000000000
--- a/.github/workflows/build_and_test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-# Avalanche root directory
-AVALANCHE_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd ../.. && pwd )
-
-"$AVALANCHE_PATH"/scripts/build.sh
-# Check to see if the build script creates any unstaged changes to prevent
-# regression where builds go.mod/go.sum files get out of date.
-if [[ -z $(git status -s) ]]; then
-    echo "Build script created unstaged changes in the repository"
-    # TODO: Revise this check once we can reliably build without changes
-    # exit 1
-fi
-
-"$AVALANCHE_PATH"/scripts/build_test.sh
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/test.unit.yml
similarity index 76%
rename from .github/workflows/build-and-test.yml
rename to .github/workflows/test.unit.yml
index b2dad1c498b8..ae4cb85983c3 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/test.unit.yml
@@ -1,4 +1,4 @@
-name: Build + Unit Tests
+name: Unit Tests
 
 on:
   push:
@@ -17,8 +17,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run_build_unit_tests:
-    name: build_unit_test
+  unit_tests:
+    name: unit_tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -32,16 +32,13 @@ jobs:
       - name: Set timeout on Windows # Windows UT run slower and need a longer timeout
         shell: bash
         if: matrix.os == 'windows-2022'
-        run: |
-          echo "TIMEOUT=240s" >> $GITHUB_ENV
+        run: echo "TIMEOUT=240s" >> $GITHUB_ENV
       - name: build_test
         shell: bash
-        run: .github/workflows/build_and_test.sh
+        run: ./scripts/build_test.sh
         env:
           TIMEOUT: ${{ env.TIMEOUT }}
       - name: fuzz_test
         shell: bash
         if: matrix.os == 'ubuntu-22.04' # Only run on Ubuntu 22.04
-        run: | # Run each fuzz test 15 seconds
-          cd ${{ github.workspace }}
-          ./scripts/build_fuzz.sh 15
+        run: ./scripts/build_fuzz.sh 15 # Run each fuzz test 15 seconds