diff --git a/build.sh b/build.sh
index 4766eb1..e267bda 100755
--- a/build.sh
+++ b/build.sh
@@ -18,10 +18,10 @@ cargo build --all --all-targets  --release
 echo "Running unit tests..."
 cargo test --features enable-system-alloc
 
-# Ensure VERSION environment variable is set
-if [ -z "$VERSION" ]; then
-  echo "ERROR: VERSION environment variable is not set."
-  exit 1
+# Ensure SERVER_VERSION environment variable is set
+if [ -z "$SERVER_VERSION" ]; then
+    echo "ERROR: SERVER_VERSION environment variable is not set. Defaulting to unstable."
+    export SERVER_VERSION="unstable"
 fi
 
 if [ "$SERVER_VERSION" != "unstable" ] && [ "$SERVER_VERSION" != "8.0.0" ] ; then
diff --git a/tests/test_save_and_restore.py b/tests/test_save_and_restore.py
index 4787ba9..e0c643e 100644
--- a/tests/test_save_and_restore.py
+++ b/tests/test_save_and_restore.py
@@ -1,6 +1,7 @@
 import pytest, time
 import os
 from valkey_test_case import ValkeyTestCase
+from valkeytests.conftest import resource_port_tracker
 
 class TestBloomSaveRestore(ValkeyTestCase):