diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go
index ab6eebd91093..811a6868f080 100644
--- a/baseapp/baseapp_test.go
+++ b/baseapp/baseapp_test.go
@@ -141,7 +141,7 @@ func setupBaseAppWithSnapshots(t *testing.T, config *setupConfig) (*BaseApp, fun
 		}))
 	}
 
-	snapshotTimeout := 1 * time.Minute
+	snapshotTimeout := 90 * time.Second
 	snapshotDir, err := ioutil.TempDir("", "baseapp")
 	require.NoError(t, err)
 	snapshotStore, err := snapshots.NewStore(dbm.NewMemDB(), snapshotDir)