diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d75c838..261073e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,12 +8,18 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install dependencies
+      # TODO:  Test against Redis and KeyDB in addition to Valkey
+      - name: Install Valkey
         run: |
-          curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
-          echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
-          sudo apt-get update
-          sudo apt-get install -y redis-server valgrind libevent-dev
+          git clone --depth 1 --branch 7.2.5 https://github.com/valkey-io/valkey.git
+          cd valkey && BUILD_TLS=yes sudo make install
+
+          #      - name: Install dependencies
+          #        run: |
+          #          curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
+          #          echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
+          #          sudo apt-get update
+          #          sudo apt-get install -y redis-server valgrind libevent-dev
 
       - name: Build using cmake
         env:
@@ -62,17 +68,19 @@ jobs:
         run: USE_SSL=1 TEST_ASYNC=1 make
 
       - name: Run tests
+        working-directory: tests
         env:
           SKIPS_AS_FAILS: 1
           TEST_SSL: 1
-        run: $GITHUB_WORKSPACE/test.sh
+        run: ./test.sh
 
       - name: Run tests under valgrind
+        working-directory: tests
         env:
           SKIPS_AS_FAILS: 1
           TEST_SSL: 1
           TEST_PREFIX: valgrind --error-exitcode=99 --track-origins=yes --leak-check=full
-        run: $GITHUB_WORKSPACE/test.sh
+        run: ./test.sh
 
   centos8:
     name: RockyLinux 8
@@ -100,17 +108,19 @@ jobs:
         run: USE_SSL=1 TEST_ASYNC=1 make
 
       - name: Run tests
+        working-directory: tests
         env:
           SKIPS_AS_FAILS: 1
           TEST_SSL: 1
-        run: $GITHUB_WORKSPACE/test.sh
+        run: ./test.sh
 
       - name: Run tests under valgrind
+        working-directory: tests
         env:
           SKIPS_AS_FAILS: 1
           TEST_SSL: 1
           TEST_PREFIX: valgrind --error-exitcode=99 --track-origins=yes --leak-check=full
-        run: $GITHUB_WORKSPACE/test.sh
+        run: ./test.sh
 
   freebsd:
     runs-on: ubuntu-latest
@@ -141,9 +151,10 @@ jobs:
         run: USE_SSL=1 make
 
       - name: Run tests
+        working-directory: tests
         env:
           TEST_SSL: 1
-        run: $GITHUB_WORKSPACE/test.sh
+        run: ./test.sh
 
   windows:
     name: Windows