diff --git a/baseapp/abci_test.go b/baseapp/abci_test.go
index 46f9a36adb..47d636d8c7 100644
--- a/baseapp/abci_test.go
+++ b/baseapp/abci_test.go
@@ -2781,11 +2781,12 @@ func TestABCI_Proposal_FailReCheckTx(t *testing.T) {
 }
 
 func TestFinalizeBlockDeferResponseHandle(t *testing.T) {
-	suite := NewBaseAppSuite(t, baseapp.SetHaltHeight(1))
-	suite.baseApp.SetStreamingManager(storetypes.StreamingManager{
-		ABCIListeners: []storetypes.ABCIListener{
-			&mockABCIListener{},
-		},
+	suite := NewBaseAppSuite(t, baseapp.SetHaltHeight(1), func(ba *baseapp.BaseApp) {
+		ba.SetStreamingManager(storetypes.StreamingManager{
+			ABCIListeners: []storetypes.ABCIListener{
+				&mockABCIListener{},
+			},
+		})
 	})
 
 	res, err := suite.baseApp.FinalizeBlock(&abci.FinalizeBlockRequest{