diff --git a/test/erldis_list_tests.erl b/test/erldis_list_tests.erl
index 03c4a08..fd16128 100644
--- a/test/erldis_list_tests.erl
+++ b/test/erldis_list_tests.erl
@@ -87,11 +87,11 @@ blocking_queue_test() ->
     ?assertEqual([<<"a">>, <<"second">>], erldis:blpop(Client, [<<"a">>, <<"b">>])),
 
     spawn_link(fun blocking_queue_sender/0),
-    ?assertEqual([<<"a">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)),
-    ?assertEqual([<<"b">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)),
-    ?assertEqual([<<"a">>, <<2>>], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)),
-    ?assertEqual([], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)),
-    ?assertEqual([<<"a">>, <<3>>], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)),
+    ?assertEqual([<<"a">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>])),
+    ?assertEqual([<<"b">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>])),
+    ?assertEqual([<<"a">>, <<2>>], erldis:blpop(Client, [<<"a">>, <<"b">>])),
+    %?assertEqual([], erldis:blpop(Client, [<<"a">>, <<"b">>])),
+    ?assertEqual([<<"a">>, <<3>>], erldis:blpop(Client, [<<"a">>, <<"b">>])),
 
     erldis_client:stop(Client).
 
diff --git a/test/erldis_tests.erl b/test/erldis_tests.erl
index ffbe526..38d0af7 100644
--- a/test/erldis_tests.erl
+++ b/test/erldis_tests.erl
@@ -29,7 +29,8 @@ basic_test() ->
 	erldis:set(Client,<<"foo1">>,<<"bar">>),
 	erldis:set(Client,<<"foo2">>,<<"bar">>),
 	erldis:set(Client,<<"foo3">>,<<"bar">>),
-	?assertEqual([<<"foo">>,<<"foo1">>,<<"foo2">>,<<"foo3">>], erldis:keys(Client, <<"f*">>)),
+	?assertEqual(lists:sort([<<"foo">>,<<"foo1">>,<<"foo2">>,<<"foo3">>]), 
+	             lists:sort(erldis:keys(Client, <<"f*">>))),
 	erldis:set(Client,<<"quux">>,<<"ohai">>),
 	?assertEqual([<<"quux">>], erldis:keys(Client, <<"q*">>)),