diff --git a/simapp/app_test.go b/simapp/app_test.go
index 2adcf2e7e8d2..049e00b77ae8 100644
--- a/simapp/app_test.go
+++ b/simapp/app_test.go
@@ -94,7 +94,7 @@ func TestRunMigrations(t *testing.T) {
 			var err error
 
 			// Since it's very hard to test actual in-place store migrations in
-			// tests (due to the difficulty of maintaing multiple versions of a
+			// tests (due to the difficulty of maintaining multiple versions of a
 			// module), we're just testing here that the migration logic is
 			// called.
 			called := 0
diff --git a/types/bench_test.go b/types/bench_test.go
index e4d8a07e1ca0..e9ed9fa12bff 100644
--- a/types/bench_test.go
+++ b/types/bench_test.go
@@ -30,51 +30,51 @@ func BenchmarkParseCoin(b *testing.B) {
 }
 
 func BenchmarkUintMarshal(b *testing.B) {
-        var values = []uint64{
-                0,
-                1,
-                1 << 10,
-                1<<10 - 3,
-                1<<63 - 1,
-                1<<32 - 7,
-                1<<22 - 8,
-        }
+	var values = []uint64{
+		0,
+		1,
+		1 << 10,
+		1<<10 - 3,
+		1<<63 - 1,
+		1<<32 - 7,
+		1<<22 - 8,
+	}
 
-        var scratch [20]byte
-        b.ReportAllocs()
-        for i := 0; i < b.N; i++ {
-                for _, value := range values {
-                        u := types.NewUint(value)
-                        n, err := u.MarshalTo(scratch[:])
-                        if err != nil {
-                                b.Fatal(err)
-                        }
-                        b.SetBytes(int64(n))
-                }
-        }
+	var scratch [20]byte
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		for _, value := range values {
+			u := types.NewUint(value)
+			n, err := u.MarshalTo(scratch[:])
+			if err != nil {
+				b.Fatal(err)
+			}
+			b.SetBytes(int64(n))
+		}
+	}
 }
 
 func BenchmarkIntMarshal(b *testing.B) {
-        var values = []int64{
-                0,
-                1,
-                1 << 10,
-                1<<10 - 3,
-                1<<63 - 1,
-                1<<32 - 7,
-                1<<22 - 8,
-        }
+	var values = []int64{
+		0,
+		1,
+		1 << 10,
+		1<<10 - 3,
+		1<<63 - 1,
+		1<<32 - 7,
+		1<<22 - 8,
+	}
 
-        var scratch [20]byte
-        b.ReportAllocs()
-        for i := 0; i < b.N; i++ {
-                for _, value := range values {
-                        in := types.NewInt(value)
-                        n, err := in.MarshalTo(scratch[:])
-                        if err != nil {
-                                b.Fatal(err)
-                        }
-                        b.SetBytes(int64(n))
-                }
-        }
+	var scratch [20]byte
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		for _, value := range values {
+			in := types.NewInt(value)
+			n, err := in.MarshalTo(scratch[:])
+			if err != nil {
+				b.Fatal(err)
+			}
+			b.SetBytes(int64(n))
+		}
+	}
 }
diff --git a/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go b/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go
index c1fb05413d9d..66a5120309c0 100644
--- a/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go
@@ -307,7 +307,7 @@ func (suite *TendermintTestSuite) TestCheckSubstituteAndUpdateState() {
 				suite.coordinator.CommitBlock(suite.chainA, suite.chainB)
 			}
 
-			// get updated substitue
+			// get updated substitute
 			substituteClientState = suite.chainA.GetClientState(substitute).(*types.ClientState)
 
 			subjectClientStore := suite.chainA.App.IBCKeeper.ClientKeeper.ClientStore(suite.chainA.GetContext(), subject)