diff --git a/modules/core/02-client/types/height_test.go b/modules/core/02-client/types/height_test.go
index f9638c6b416..68fccb50a76 100644
--- a/modules/core/02-client/types/height_test.go
+++ b/modules/core/02-client/types/height_test.go
@@ -147,14 +147,14 @@ func (suite *TypesTestSuite) TestSelfHeight() {
 	ctx := suite.chainA.GetContext()
 
 	// Test default revision
-	ctx = ctx.WithBlockHeight(10)
 	ctx = ctx.WithChainID("gaiamainnet")
+	ctx = ctx.WithBlockHeight(10)
 	height := types.GetSelfHeight(ctx)
 	suite.Require().Equal(types.NewHeight(0, 10), height, "default self height failed")
 
 	// Test successful revision format
-	ctx = ctx.WithBlockHeight(18)
 	ctx = ctx.WithChainID("gaiamainnet-3")
+	ctx = ctx.WithBlockHeight(18)
 	height = types.GetSelfHeight(ctx)
 	suite.Require().Equal(types.NewHeight(3, 18), height, "valid self height failed")
 }