diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index d8de34e1..058ea0c0 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -17,6 +17,7 @@ set ::all_tests {
     unit/auth
     unit/protocol
     unit/basic
+    unit/scan
     unit/type/list
     unit/type/list-2
     unit/type/list-3
diff --git a/tests/unit/basic.tcl b/tests/unit/basic.tcl
index 67651666..1f46ba66 100644
--- a/tests/unit/basic.tcl
+++ b/tests/unit/basic.tcl
@@ -761,58 +761,4 @@ start_server {tags {"basic"}} {
         r keys *
         r keys *
     } {dlskeriewrioeuwqoirueioqwrueoqwrueqw}
-
-    test "SCAN basic" {
-        r flushdb
-        r debug populate 1000
-
-        set cur 0
-        set keys {}
-        while 1 {
-            set res [r scan $cur]
-            set cur [lindex $res 0]
-            set k [lindex $res 1]
-            lappend keys $k
-            if {$cur == 0} break
-        }
-
-        set keys [lsort -unique [concat {*}$keys]]
-        assert_equal 1000 [llength $keys]
-    }
-
-    test "SCAN COUNT" {
-        r flushdb
-        r debug populate 1000
-
-        set cur 0
-        set keys {}
-        while 1 {
-            set res [r scan $cur count 5]
-            set cur [lindex $res 0]
-            set k [lindex $res 1]
-            lappend keys $k
-            if {$cur == 0} break
-        }
-
-        set keys [lsort -unique [concat {*}$keys]]
-        assert_equal 1000 [llength $keys]
-    }
-
-    test "SCAN MATCH" {
-        r flushdb
-        r debug populate 1000
-
-        set cur 0
-        set keys {}
-        while 1 {
-            set res [r scan $cur match "key:1??"]
-            set cur [lindex $res 0]
-            set k [lindex $res 1]
-            lappend keys $k
-            if {$cur == 0} break
-        }
-
-        set keys [lsort -unique [concat {*}$keys]]
-        assert_equal 100 [llength $keys]
-    }
 }
diff --git a/tests/unit/scan.tcl b/tests/unit/scan.tcl
new file mode 100644
index 00000000..275a4d65
--- /dev/null
+++ b/tests/unit/scan.tcl
@@ -0,0 +1,55 @@
+start_server {tags {"scan"}} {
+    test "SCAN basic" {
+        r flushdb
+        r debug populate 1000
+
+        set cur 0
+        set keys {}
+        while 1 {
+            set res [r scan $cur]
+            set cur [lindex $res 0]
+            set k [lindex $res 1]
+            lappend keys $k
+            if {$cur == 0} break
+        }
+
+        set keys [lsort -unique [concat {*}$keys]]
+        assert_equal 1000 [llength $keys]
+    }
+
+    test "SCAN COUNT" {
+        r flushdb
+        r debug populate 1000
+
+        set cur 0
+        set keys {}
+        while 1 {
+            set res [r scan $cur count 5]
+            set cur [lindex $res 0]
+            set k [lindex $res 1]
+            lappend keys $k
+            if {$cur == 0} break
+        }
+
+        set keys [lsort -unique [concat {*}$keys]]
+        assert_equal 1000 [llength $keys]
+    }
+
+    test "SCAN MATCH" {
+        r flushdb
+        r debug populate 1000
+
+        set cur 0
+        set keys {}
+        while 1 {
+            set res [r scan $cur match "key:1??"]
+            set cur [lindex $res 0]
+            set k [lindex $res 1]
+            lappend keys $k
+            if {$cur == 0} break
+        }
+
+        set keys [lsort -unique [concat {*}$keys]]
+        assert_equal 100 [llength $keys]
+    }
+}