diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e11aed2f5d..0131fe322a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,7 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#8731](https://github.com/osmosis-labs/osmosis/pull/8731) fix: in place testnet logs
 * [#8728](https://github.com/osmosis-labs/osmosis/pull/8728) fix unsupported sign-mode issue
 * [#8743](https://github.com/osmosis-labs/osmosis/pull/8743) chore: bump sdk and cometbft
-
+* [#8765, 8768](https://github.com/osmosis-labs/osmosis/pull/8765) fix concurrency issue in go test(x/lockup)
 * [#8563](https://github.com/osmosis-labs/osmosis/pull/8755) [x/concentratedliquidity]: Fix Incorrect Event Emission
 * [#8765](https://github.com/osmosis-labs/osmosis/pull/8765) fix concurrency issue in go test(x/lockup)
 
diff --git a/x/lockup/keeper/genesis_test.go b/x/lockup/keeper/genesis_test.go
index cd82e8c4fec..60801c0bfb0 100644
--- a/x/lockup/keeper/genesis_test.go
+++ b/x/lockup/keeper/genesis_test.go
@@ -176,13 +176,6 @@ func TestMarshalUnmarshalGenesis(t *testing.T) {
 
 	// Ensure no panic occurs when initializing genesis in a fresh app
 	assert.NotPanics(t, func() {
-		// Setup a new app instance
-		app := osmoapp.Setup(false)
-		ctx := app.BaseApp.NewContextLegacy(false, tmproto.Header{})
-		ctx = ctx.WithBlockTime(now.Add(time.Second))
-
-		// Initialize genesis with the exported state
-		am := lockup.NewAppModule(*app.LockupKeeper, app.AccountKeeper, app.BankKeeper)
 		am.InitGenesis(ctx, appCodec, genesisExported)
 	})
 }