diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index 9f76e0e9426f45eea15b62e4921b21e8e17c2481..2b6d7ab48f2ee5fbe6a876b4a19f1829842b0907 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -13,7 +13,7 @@ set ::host 127.0.0.1
 set ::port 16379
 set ::traceleaks 0
 set ::valgrind 0
-set ::verbose 1
+set ::verbose 0
 set ::denytags {}
 set ::allowtags {}
 set ::external 0; # If "1" this means, we are running against external instance
@@ -110,7 +110,6 @@ proc cleanup {} {
 }
 
 proc execute_everything {} {
-    if 0 {
     execute_tests "unit/auth"
     execute_tests "unit/protocol"
     execute_tests "unit/basic"
@@ -127,20 +126,20 @@ proc execute_everything {} {
     execute_tests "integration/aof"
 #    execute_tests "integration/redis-cli"
     execute_tests "unit/pubsub"
-    }
 
     # run tests with diskstore enabled
+    puts "Running diskstore tests... this is slow, press Ctrl+C if not interested.."
     set ::diskstore 1
     lappend ::denytags nodiskstore
     set ::global_overrides {diskstore-enabled yes}
-#    execute_tests "unit/protocol"
-#    execute_tests "unit/basic"
-#    execute_tests "unit/type/list"
-#    execute_tests "unit/type/set"
-#    execute_tests "unit/type/zset"
-#    execute_tests "unit/type/hash"
-#    execute_tests "unit/sort"
-#    execute_tests "unit/expire"
+    execute_tests "unit/protocol"
+    execute_tests "unit/basic"
+    execute_tests "unit/type/list"
+    execute_tests "unit/type/set"
+    execute_tests "unit/type/zset"
+    execute_tests "unit/type/hash"
+    execute_tests "unit/sort"
+    execute_tests "unit/expire"
     execute_tests "unit/other"
     execute_tests "unit/cas"
 }
diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl
index 15fb55b4f2ef0aef247f0ee04235f16c22407044..f30505d102d276c586679e04dc8fc7c6304fdbde 100644
--- a/tests/unit/other.tcl
+++ b/tests/unit/other.tcl
@@ -120,34 +120,36 @@ start_server {tags {"other"}} {
         list $e1 $e2
     } {1 1}
 
-    test {PIPELINING stresser (also a regression for the old epoll bug)} {
-        set fd2 [socket $::host $::port]
-        fconfigure $fd2 -encoding binary -translation binary
-        puts -nonewline $fd2 "SELECT 9\r\n"
-        flush $fd2
-        gets $fd2
-
-        for {set i 0} {$i < 100000} {incr i} {
-            set q {}
-            set val "0000${i}0000"
-            append q "SET key:$i $val\r\n"
-            puts -nonewline $fd2 $q
-            set q {}
-            append q "GET key:$i\r\n"
-            puts -nonewline $fd2 $q
-        }
-        flush $fd2
-
-        for {set i 0} {$i < 100000} {incr i} {
-            gets $fd2 line
-            gets $fd2 count
-            set count [string range $count 1 end]
-            set val [read $fd2 $count]
-            read $fd2 2
-        }
-        close $fd2
-        set _ 1
-    } {1}
+    tags {protocol nodiskstore} {
+        test {PIPELINING stresser (also a regression for the old epoll bug)} {
+            set fd2 [socket $::host $::port]
+            fconfigure $fd2 -encoding binary -translation binary
+            puts -nonewline $fd2 "SELECT 9\r\n"
+            flush $fd2
+            gets $fd2
+
+            for {set i 0} {$i < 100000} {incr i} {
+                set q {}
+                set val "0000${i}0000"
+                append q "SET key:$i $val\r\n"
+                puts -nonewline $fd2 $q
+                set q {}
+                append q "GET key:$i\r\n"
+                puts -nonewline $fd2 $q
+            }
+            flush $fd2
+
+            for {set i 0} {$i < 100000} {incr i} {
+                gets $fd2 line
+                gets $fd2 count
+                set count [string range $count 1 end]
+                set val [read $fd2 $count]
+                read $fd2 2
+            }
+            close $fd2
+            set _ 1
+        } {1}
+    }
 
     test {MUTLI / EXEC basics} {
         r del mylist