diff --git a/src/leveled_pmem.erl b/src/leveled_pmem.erl
index a36d4ac..b5ea64d 100644
--- a/src/leveled_pmem.erl
+++ b/src/leveled_pmem.erl
@@ -351,7 +351,11 @@ compare_method_test() ->
                 [timer:now_diff(os:timestamp(), SWb), Sz1]),
     ?assertMatch(Sz0, Sz1).
 
-with_index_test() ->
+with_index_test_() ->
+    % Otherwise this test may timeout when run with coverage enabled
+    {timeout, 60, fun with_index_test2/0}.
+
+with_index_test2() ->
     IndexPrepareFun =
         fun({K, _V}, Acc) ->
             H = leveled_codec:magic_hash(K),
diff --git a/src/leveled_tictac.erl b/src/leveled_tictac.erl
index bd7f591..e7ced1e 100644
--- a/src/leveled_tictac.erl
+++ b/src/leveled_tictac.erl
@@ -356,9 +356,11 @@ merge_bysize_medium_test() ->
 merge_bysize_large_test() ->
     merge_test_withsize(large).
 
-% merge_bysize_xlarge_test() ->
-%    merge_test_withsize(xlarge).
-% timmeout on cover test - so commented
+merge_bysize_xlarge_test_() ->
+    {timeout, 60, fun merge_bysize_xlarge_test2/0}.
+
+merge_bysize_xlarge_test2() ->
+    merge_test_withsize(xlarge).
 
 merge_test_withsize(Size) ->
     HashFun = fun(_K, V) -> erlang:phash2(V) end,
diff --git a/test/end_to_end/basic_SUITE.erl b/test/end_to_end/basic_SUITE.erl
index 2f3337d..ce8f4b0 100644
--- a/test/end_to_end/basic_SUITE.erl
+++ b/test/end_to_end/basic_SUITE.erl
@@ -123,11 +123,11 @@ journal_compaction(_Config) ->
     ChkList1 = lists:sublist(lists:sort(ObjList1), 10000),
     testutil:check_forlist(Bookie1, ChkList1),
     testutil:check_forobject(Bookie1, TestObject),
-    {B2, K2, V2, Spec2, MD} = {"Bucket1",
-                                "Key1",
-                                "Value1",
+    {B2, K2, V2, Spec2, MD} = {"Bucket2",
+                                "Key2",
+                                "Value2",
                                 [],
-                                [{"MDK1", "MDV1"}]},
+                                [{"MDK2", "MDV2"}]},
     {TestObject2, TestSpec2} = testutil:generate_testobject(B2, K2,
                                                             V2, Spec2, MD),
     ok = testutil:book_riakput(Bookie1, TestObject2, TestSpec2),
diff --git a/test/end_to_end/testutil.erl b/test/end_to_end/testutil.erl
index 305a371..78c92c4 100644
--- a/test/end_to_end/testutil.erl
+++ b/test/end_to_end/testutil.erl
@@ -502,7 +502,7 @@ check_indexed_objects(Book, B, KSpecL, V) ->
                                                 {fun foldkeysfun/3, []},
                                                 {"idx1_bin",
                                                     "0",
-                                                    "~"},
+                                                    "|"},
                                                 ?RETURN_TERMS}),
     SW = os:timestamp(),
     {async, Fldr} = R,