diff --git a/tests/helpers/bg_block_op.tcl b/tests/helpers/bg_block_op.tcl
index c8b323308..f76c22381 100644
--- a/tests/helpers/bg_block_op.tcl
+++ b/tests/helpers/bg_block_op.tcl
@@ -1,4 +1,4 @@
-source tests/support/redis.tcl
+source tests/support/keydb.tcl
 source tests/support/util.tcl
 
 set ::tlsdir "tests/tls"
diff --git a/tests/helpers/bg_complex_data.tcl b/tests/helpers/bg_complex_data.tcl
index e888748a7..606ed8f8b 100644
--- a/tests/helpers/bg_complex_data.tcl
+++ b/tests/helpers/bg_complex_data.tcl
@@ -1,4 +1,4 @@
-source tests/support/redis.tcl
+source tests/support/keydb.tcl
 source tests/support/util.tcl
 
 set ::tlsdir "tests/tls"
diff --git a/tests/helpers/gen_write_load.tcl b/tests/helpers/gen_write_load.tcl
index cbf6651bd..200026af6 100644
--- a/tests/helpers/gen_write_load.tcl
+++ b/tests/helpers/gen_write_load.tcl
@@ -1,4 +1,4 @@
-source tests/support/redis.tcl
+source tests/support/keydb.tcl
 
 set ::tlsdir "tests/tls"
 
diff --git a/tests/instances.tcl b/tests/instances.tcl
index e494e741c..ce5518231 100644
--- a/tests/instances.tcl
+++ b/tests/instances.tcl
@@ -10,7 +10,7 @@
 package require Tcl 8.5
 
 set tcl_precision 17
-source ../support/redis.tcl
+source ../support/keydb.tcl
 source ../support/util.tcl
 source ../support/server.tcl
 source ../support/test.tcl
diff --git a/tests/integration/redis-benchmark.tcl b/tests/integration/keydb-benchmark.tcl
similarity index 100%
rename from tests/integration/redis-benchmark.tcl
rename to tests/integration/keydb-benchmark.tcl
diff --git a/tests/integration/redis-cli.tcl b/tests/integration/keydb-cli.tcl
similarity index 100%
rename from tests/integration/redis-cli.tcl
rename to tests/integration/keydb-cli.tcl
diff --git a/tests/support/redis.tcl b/tests/support/keydb.tcl
similarity index 100%
rename from tests/support/redis.tcl
rename to tests/support/keydb.tcl
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index f942ec838..c4abcf2f3 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -5,7 +5,7 @@
 package require Tcl 8.5
 
 set tcl_precision 17
-source tests/support/redis.tcl
+source tests/support/keydb.tcl
 source tests/support/server.tcl
 source tests/support/tmpfile.tcl
 source tests/support/test.tcl
@@ -57,8 +57,8 @@ set ::all_tests {
     integration/psync2-reg
     integration/psync2-pingoff
     integration/failover
-    integration/redis-cli
-    integration/redis-benchmark
+    integration/keydb-cli
+    integration/keydb-benchmark
     unit/pubsub
     unit/slowlog
     unit/scripting
diff --git a/utils/speed-regression.tcl b/utils/speed-regression.tcl
index 8d5220c75..1e9181d41 100755
--- a/utils/speed-regression.tcl
+++ b/utils/speed-regression.tcl
@@ -2,7 +2,7 @@
 # Copyright (C) 2011 Salvatore Sanfilippo
 # Released under the BSD license like Redis itself
 
-source ../tests/support/redis.tcl
+source ../tests/support/keydb.tcl
 set ::port 12123
 set ::tests {PING,SET,GET,INCR,LPUSH,LPOP,SADD,SPOP,LRANGE_100,LRANGE_600,MSET}
 set ::datasize 16