diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go
index 9c10b36290..e8b9ae39bc 100644
--- a/swarm/storage/ldbstore_test.go
+++ b/swarm/storage/ldbstore_test.go
@@ -344,17 +344,18 @@ func TestLDBStoreWithoutCollectGarbage(t *testing.T) {
 func TestLDBStoreCollectGarbage(t *testing.T) {
 
 	// below max ronud
-	cap := defaultMaxGCRound / 2
+	initialCap := defaultMaxGCRound / 100
+	cap := initialCap / 2
 	t.Run(fmt.Sprintf("A/%d/%d", cap, cap*4), testLDBStoreCollectGarbage)
 	t.Run(fmt.Sprintf("B/%d/%d", cap, cap*4), testLDBStoreRemoveThenCollectGarbage)
 
 	// at max round
-	cap = defaultMaxGCRound
+	cap = initialCap
 	t.Run(fmt.Sprintf("A/%d/%d", cap, cap*4), testLDBStoreCollectGarbage)
 	t.Run(fmt.Sprintf("B/%d/%d", cap, cap*4), testLDBStoreRemoveThenCollectGarbage)
 
 	// more than max around, not on threshold
-	cap = defaultMaxGCRound * 1.1
+	cap = initialCap + 500
 	t.Run(fmt.Sprintf("A/%d/%d", cap, cap*4), testLDBStoreCollectGarbage)
 	t.Run(fmt.Sprintf("B/%d/%d", cap, cap*4), testLDBStoreRemoveThenCollectGarbage)
 
@@ -578,7 +579,7 @@ func testLDBStoreRemoveThenCollectGarbage(t *testing.T) {
 // TestLDBStoreCollectGarbageAccessUnlikeIndex tests garbage collection where accesscount differs from indexcount
 func TestLDBStoreCollectGarbageAccessUnlikeIndex(t *testing.T) {
 
-	capacity := defaultMaxGCRound * 2
+	capacity := defaultMaxGCRound / 100 * 2
 	n := capacity - 1
 
 	ldb, cleanup := newLDBStore(t)
diff --git a/swarm/storage/mock/rpc/rpc_test.go b/swarm/storage/mock/rpc/rpc_test.go
index 52b634a445..f62340edec 100644
--- a/swarm/storage/mock/rpc/rpc_test.go
+++ b/swarm/storage/mock/rpc/rpc_test.go
@@ -37,5 +37,5 @@ func TestRPCStore(t *testing.T) {
 	store := NewGlobalStore(rpc.DialInProc(server))
 	defer store.Close()
 
-	test.MockStore(t, store, 100)
+	test.MockStore(t, store, 30)
 }