diff --git a/cmd/gossamer/config_test.go b/cmd/gossamer/config_test.go
index 1194f2a154..9d3633b1e2 100644
--- a/cmd/gossamer/config_test.go
+++ b/cmd/gossamer/config_test.go
@@ -65,9 +65,9 @@ func TestConfigFromChainFlag(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg.System = types.SystemInfo{}
 			require.Equal(t, c.expected, cfg)
 		})
@@ -103,9 +103,9 @@ func TestInitConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createInitConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.Init)
 		})
 	}
@@ -259,9 +259,9 @@ func TestGlobalConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			require.Equal(t, c.expected, cfg.Global)
 		})
@@ -309,7 +309,7 @@ func TestGlobalConfigFromFlagsFails(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			cfg, err := createDotConfig(ctx)
 			require.NotNil(t, err)
@@ -358,9 +358,9 @@ func TestAccountConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.Account)
 		})
 	}
@@ -411,9 +411,9 @@ func TestCoreConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.Core)
 		})
 	}
@@ -547,9 +547,9 @@ func TestNetworkConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.Network)
 		})
 	}
@@ -756,9 +756,9 @@ func TestRPCConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.RPC)
 		})
 	}
@@ -774,7 +774,7 @@ func TestUpdateConfigFromGenesisJSON(t *testing.T) {
 		[]string{"config", "genesis", "name"},
 		[]interface{}{testCfgFile.Name(), genFile, testCfg.Global.Name},
 	)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := &dot.Config{
 		Global: dot.GlobalConfig{
@@ -809,7 +809,7 @@ func TestUpdateConfigFromGenesisJSON(t *testing.T) {
 	}
 
 	cfg, err := createDotConfig(ctx)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	cfg.Init.Genesis = genFile
 	updateDotConfigFromGenesisJSONRaw(*dotConfigToToml(testCfg), cfg)
@@ -828,7 +828,7 @@ func TestUpdateConfigFromGenesisJSON_Default(t *testing.T) {
 		[]string{"config", "genesis", "name"},
 		[]interface{}{testCfgFile.Name(), "", testCfg.Global.Name},
 	)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := &dot.Config{
 		Global: dot.GlobalConfig{
@@ -863,7 +863,7 @@ func TestUpdateConfigFromGenesisJSON_Default(t *testing.T) {
 	}
 
 	cfg, err := createDotConfig(ctx)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	updateDotConfigFromGenesisJSONRaw(*dotConfigToToml(testCfg), cfg)
 	cfg.System = types.SystemInfo{}
 	require.Equal(t, expected, cfg)
@@ -878,7 +878,7 @@ func TestUpdateConfigFromGenesisData(t *testing.T) {
 		[]string{"config", "genesis", "name"},
 		[]interface{}{testCfgFile.Name(), genFile, testCfg.Global.Name},
 	)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := &dot.Config{
 		Global: dot.GlobalConfig{
@@ -922,24 +922,24 @@ func TestUpdateConfigFromGenesisData(t *testing.T) {
 	}
 
 	cfg, err := createDotConfig(ctx)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	cfg.Init.Genesis = genFile
 
 	db, err := utils.SetupDatabase(cfg.Global.BasePath, false)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	gen, err := genesis.NewGenesisFromJSONRaw(genFile)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = state.NewBaseState(db).StoreGenesisData(gen.GenesisData())
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = db.Close()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = updateDotConfigFromGenesisData(ctx, cfg) // name should not be updated if provided as flag value
-	require.Nil(t, err)
+	require.NoError(t, err)
 	cfg.System = types.SystemInfo{}
 	require.Equal(t, expected, cfg)
 }
@@ -991,9 +991,9 @@ func TestGlobalNodeName_WhenNodeAlreadyHasStoredName(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			createdCfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, createdCfg.Global.Name)
 		})
 	}
@@ -1024,9 +1024,9 @@ func TestGlobalNodeNamePriorityOrder(t *testing.T) {
 	c := whenNameFlagIsDefined
 	t.Run(c.description, func(t *testing.T) {
 		ctx, err := newTestContext(c.description, c.flags, c.values)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		createdCfg, err := createDotConfig(ctx)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.Equal(t, c.expected, createdCfg.Global.Name)
 	})
 
@@ -1047,9 +1047,9 @@ func TestGlobalNodeNamePriorityOrder(t *testing.T) {
 	c = whenNameIsDefinedOnTomlConfig
 	t.Run(c.description, func(t *testing.T) {
 		ctx, err := newTestContext(c.description, c.flags, c.values)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		createdCfg, err := createDotConfig(ctx)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.Equal(t, c.expected, createdCfg.Global.Name)
 	})
 
@@ -1069,9 +1069,9 @@ func TestGlobalNodeNamePriorityOrder(t *testing.T) {
 
 	t.Run(c.description, func(t *testing.T) {
 		ctx, err := newTestContext(whenThereIsNoName.description, whenThereIsNoName.flags, whenThereIsNoName.values)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		createdCfg, err := createDotConfig(ctx)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.NotEmpty(t, createdCfg.Global.Name)
 		require.NotEqual(t, cfg.Global.Name, createdCfg.Global.Name)
 	})
diff --git a/cmd/gossamer/export_test.go b/cmd/gossamer/export_test.go
index f7c2b63b26..78a6f1931b 100644
--- a/cmd/gossamer/export_test.go
+++ b/cmd/gossamer/export_test.go
@@ -160,16 +160,16 @@ func TestExportCommand(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			err = exportAction(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			config := ctx.GlobalString(ConfigFlag.Name)
 
 			cfg := new(ctoml.Config)
 			err = loadConfig(cfg, config)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			require.Equal(t, dotConfigToToml(c.expected), cfg)
 		})
diff --git a/cmd/gossamer/flags_test.go b/cmd/gossamer/flags_test.go
index 89fad2fda0..2234c82470 100644
--- a/cmd/gossamer/flags_test.go
+++ b/cmd/gossamer/flags_test.go
@@ -53,15 +53,15 @@ func TestFixFlagOrder(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			updatedInitAction := FixFlagOrder(initAction)
 			err = updatedInitAction(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			updatedExportAction := FixFlagOrder(exportAction)
 			err = updatedExportAction(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 		})
 	}
 }
diff --git a/cmd/gossamer/toml_config_test.go b/cmd/gossamer/toml_config_test.go
index 4ffad741d0..21fad0cee9 100644
--- a/cmd/gossamer/toml_config_test.go
+++ b/cmd/gossamer/toml_config_test.go
@@ -23,10 +23,10 @@ func TestLoadConfig(t *testing.T) {
 	cfg.Init.Genesis = genFile
 
 	err := dot.InitNode(cfg)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = loadConfig(dotConfigToToml(cfg), cfgFile.Name())
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.NotNil(t, cfg)
 }
 
@@ -39,13 +39,13 @@ func TestLoadConfigGssmr(t *testing.T) {
 	cfg.Init.Genesis = utils.GetGssmrGenesisPathTest(t)
 
 	err := dot.InitNode(cfg)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	projectRootPath := utils.GetProjectRootPathTest(t)
 	gssmrConfigPath := filepath.Join(projectRootPath, "./chain/gssmr/config.toml")
 
 	err = loadConfig(dotConfigToToml(cfg), gssmrConfigPath)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.NotNil(t, cfg)
 }
 
@@ -57,11 +57,11 @@ func TestLoadConfigKusama(t *testing.T) {
 	cfg.Init.Genesis = utils.GetKusamaGenesisPath(t)
 
 	err := dot.InitNode(cfg)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	projectRootPath := utils.GetProjectRootPathTest(t)
 	kusamaConfigPath := filepath.Join(projectRootPath, "./chain/kusama/config.toml")
 
 	err = loadConfig(dotConfigToToml(cfg), kusamaConfigPath)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
diff --git a/cmd/gossamer/utils_test.go b/cmd/gossamer/utils_test.go
index 6368860963..361bc25e3f 100644
--- a/cmd/gossamer/utils_test.go
+++ b/cmd/gossamer/utils_test.go
@@ -122,7 +122,7 @@ func Test_setupLogger(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			_, err = setupLogger(ctx)
 			if c.expected != nil {
diff --git a/dot/core/helpers_test.go b/dot/core/helpers_test.go
index 92b538b154..9ef6e994ad 100644
--- a/dot/core/helpers_test.go
+++ b/dot/core/helpers_test.go
@@ -73,10 +73,10 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
 		stateSrvc.UseMemDB()
 
 		err := stateSrvc.Initialise(gen, genHeader, genTrie)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		err = stateSrvc.Start()
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}
 
 	if cfg.BlockState == nil {
diff --git a/dot/core/service_integration_test.go b/dot/core/service_integration_test.go
index 22126e23f9..bbfdf7f874 100644
--- a/dot/core/service_integration_test.go
+++ b/dot/core/service_integration_test.go
@@ -152,9 +152,9 @@ func TestService_InsertKey(t *testing.T) {
 			err := s.InsertKey(kr.Alice(), c.keystoreType)
 
 			if c.err == nil {
-				require.Nil(t, err)
+				require.NoError(t, err)
 				res, err := s.HasKey(kr.Alice().Public().Hex(), c.keystoreType)
-				require.Nil(t, err)
+				require.NoError(t, err)
 				require.True(t, res)
 			} else {
 				require.NotNil(t, err)
diff --git a/dot/network/message_test.go b/dot/network/message_test.go
index fa31efea9e..f89e8a3238 100644
--- a/dot/network/message_test.go
+++ b/dot/network/message_test.go
@@ -296,7 +296,7 @@ func TestEncodeBlockAnnounceMessage(t *testing.T) {
 		Digest:         types.NewDigest(),
 	}
 	encMsg, err := bhm.Encode()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	require.Equal(t, expected, encMsg)
 }
@@ -312,7 +312,7 @@ func TestDecode_BlockAnnounceMessage(t *testing.T) {
 	}
 
 	err := bhm.Decode(announceMessage)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	parentHash := common.MustHexToHash("0x4545454545454545454545454545454545454545454545454545454545454545")
 
@@ -344,7 +344,7 @@ func TestEncodeTransactionMessageSingleExtrinsic(t *testing.T) {
 	transactionMessage := TransactionMessage{Extrinsics: []types.Extrinsic{extrinsic}}
 
 	encMsg, err := transactionMessage.Encode()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	require.Equal(t, expected, encMsg)
 }
@@ -368,7 +368,7 @@ func TestEncodeTransactionMessageTwoExtrinsics(t *testing.T) {
 	transactionMessage := TransactionMessage{Extrinsics: []types.Extrinsic{extrinsic1, extrinsic2}}
 
 	encMsg, err := transactionMessage.Encode()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	require.Equal(t, expected, encMsg)
 }
@@ -381,7 +381,7 @@ func TestDecodeTransactionMessageOneExtrinsic(t *testing.T) {
 
 	decodedMessage := new(TransactionMessage)
 	err := decodedMessage.Decode(originalMessage)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	extrinsic := types.Extrinsic{0x01, 0x02, 0x03, 0x04}
 	expected := TransactionMessage{[]types.Extrinsic{extrinsic}}
@@ -395,11 +395,11 @@ func TestDecodeTransactionMessageTwoExtrinsics(t *testing.T) {
 
 	// (without message type byte prepended)
 	originalMessage, err := common.HexToBytes("0x080c0102031004050607")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	decodedMessage := new(TransactionMessage)
 	err = decodedMessage.Decode(originalMessage)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	extrinsic1 := types.Extrinsic{0x01, 0x02, 0x03}
 	extrinsic2 := types.Extrinsic{0x04, 0x05, 0x06, 0x07}
@@ -418,10 +418,10 @@ func TestDecodeConsensusMessage(t *testing.T) {
 	m := new(ConsensusMessage)
 
 	err := m.Decode(encMsg)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	out, err := hex.DecodeString(testData[2:])
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := &ConsensusMessage{
 		Data: out,
@@ -430,6 +430,6 @@ func TestDecodeConsensusMessage(t *testing.T) {
 	require.Equal(t, expected, m)
 
 	encodedMessage, err := expected.Encode()
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, encMsg, encodedMessage)
 }
diff --git a/dot/rpc/modules/author_integration_test.go b/dot/rpc/modules/author_integration_test.go
index 4a73cdc165..14c58987b4 100644
--- a/dot/rpc/modules/author_integration_test.go
+++ b/dot/rpc/modules/author_integration_test.go
@@ -153,7 +153,7 @@ func TestAuthorModule_SubmitExtrinsic_Integration(t *testing.T) {
 
 	res := new(ExtrinsicHashResponse)
 	err := auth.SubmitExtrinsic(nil, &Extrinsic{extHex}, res)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expectedExtrinsic := types.NewExtrinsic(extBytes)
 	expected := &transaction.ValidTransaction{
@@ -341,7 +341,7 @@ func TestAuthorModule_InsertKey_Integration(t *testing.T) {
 				return
 			}
 
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			ks, err := integrationTestController.keystore.GetKeystore([]byte(tt.ksType))
 			require.NoError(t, err)
@@ -360,7 +360,7 @@ func TestAuthorModule_HasKey_Integration(t *testing.T) {
 	ks := keystore.NewGlobalKeystore()
 
 	kr, err := keystore.NewSr25519Keyring()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	ks.Babe.Insert(kr.Alice())
 
@@ -552,7 +552,7 @@ func TestAuthorModule_SubmitExtrinsic_WithVersion_V0910(t *testing.T) {
 
 	res := new(ExtrinsicHashResponse)
 	err := auth.SubmitExtrinsic(nil, &Extrinsic{extHex}, res)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expectedExtrinsic := types.NewExtrinsic(extBytes)
 	expected := &transaction.ValidTransaction{
diff --git a/dot/rpc/modules/chain_integration_test.go b/dot/rpc/modules/chain_integration_test.go
index bc11a6a267..d5e9290d8e 100644
--- a/dot/rpc/modules/chain_integration_test.go
+++ b/dot/rpc/modules/chain_integration_test.go
@@ -158,7 +158,7 @@ func TestChainGetBlock_Genesis(t *testing.T) {
 	req := &ChainHashRequest{Bhash: &hash}
 
 	err = svc.GetBlock(nil, req, res)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	require.Equal(t, expected, res)
 }
@@ -227,7 +227,7 @@ func TestChainGetBlockHash_Latest(t *testing.T) {
 	req := ChainBlockNumberRequest{nil}
 
 	err := svc.GetBlockHash(nil, &req, &res)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := state.Block.BestBlockHash()
 	require.Equal(t, expected.String(), res)
@@ -242,7 +242,7 @@ func TestChainGetBlockHash_ByNumber(t *testing.T) {
 	req := ChainBlockNumberRequest{"1"}
 
 	err := svc.GetBlockHash(nil, &req, &res)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected, err := state.Block.GetBlockByNumber(big.NewInt(1))
 	require.NoError(t, err)
@@ -278,7 +278,7 @@ func TestChainGetBlockHash_Array(t *testing.T) {
 	req := ChainBlockNumberRequest{nums}
 
 	err := svc.GetBlockHash(nil, &req, &res)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected0, err := state.Block.GetBlockByNumber(big.NewInt(0))
 	require.NoError(t, err)
diff --git a/dot/rpc/modules/state_integration_test.go b/dot/rpc/modules/state_integration_test.go
index db5834eb2f..36ab481450 100644
--- a/dot/rpc/modules/state_integration_test.go
+++ b/dot/rpc/modules/state_integration_test.go
@@ -88,7 +88,7 @@ func TestStateModule_GetRuntimeVersion(t *testing.T) {
 			}
 
 			// Verify expected values.
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, expected, res)
 		})
 	}
diff --git a/dot/rpc/websocket_test.go b/dot/rpc/websocket_test.go
index 7e951414aa..fe7f6ea7fe 100644
--- a/dot/rpc/websocket_test.go
+++ b/dot/rpc/websocket_test.go
@@ -84,7 +84,7 @@ func TestHTTPServer_ServeHTTP(t *testing.T) {
 
 	s := NewHTTPServer(cfg)
 	err := s.Start()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	defer s.Stop()
 
@@ -101,10 +101,10 @@ func TestHTTPServer_ServeHTTP(t *testing.T) {
 
 	for _, item := range testCalls {
 		err = c.WriteMessage(websocket.TextMessage, item.call)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		_, message, err := c.ReadMessage()
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.Equal(t, item.expected, message)
 	}
 }
diff --git a/dot/state/block_data_test.go b/dot/state/block_data_test.go
index 6ca6df58a3..ca6bcab617 100644
--- a/dot/state/block_data_test.go
+++ b/dot/state/block_data_test.go
@@ -28,10 +28,10 @@ func TestGetSet_ReceiptMessageQueue_Justification(t *testing.T) {
 	parentHash := genesisHeader.Hash()
 
 	stateRoot, err := common.HexToHash("0x2747ab7c0dc38b7f2afba82bd5e2d6acef8c31e09800f660b75ec84a7005099f")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	extrinsicsRoot, err := common.HexToHash("0x03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	header := &types.Header{
 		ParentHash:     parentHash,
@@ -66,19 +66,19 @@ func TestGetSet_ReceiptMessageQueue_Justification(t *testing.T) {
 	for _, blockdata := range bds {
 
 		err := s.CompareAndSetBlockData(blockdata)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		// test Receipt
 		if blockdata.Receipt != nil {
 			receipt, err := s.GetReceipt(blockdata.Hash)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, *blockdata.Receipt, receipt)
 		}
 
 		// test MessageQueue
 		if blockdata.MessageQueue != nil {
 			messageQueue, err := s.GetMessageQueue(blockdata.Hash)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, *blockdata.MessageQueue, messageQueue)
 		}
 	}
diff --git a/dot/state/test_helpers.go b/dot/state/test_helpers.go
index 62c8def253..9c4b241f43 100644
--- a/dot/state/test_helpers.go
+++ b/dot/state/test_helpers.go
@@ -96,7 +96,7 @@ func AddBlocksToState(t *testing.T, blockState *BlockState, depth int,
 
 		hash := block.Header.Hash()
 		err = blockState.AddBlockWithArrivalTime(block, arrivalTime)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		previousHash = hash
 
@@ -140,7 +140,7 @@ func AddBlocksToState(t *testing.T, blockState *BlockState, depth int,
 
 			hash := block.Header.Hash()
 			err := blockState.AddBlockWithArrivalTime(block, arrivalTime)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			previousHash = hash
 			arrivalTime = arrivalTime.Add(inc)
@@ -184,7 +184,7 @@ func AddBlocksToStateWithFixedBranches(t *testing.T, blockState *BlockState, dep
 
 		hash := block.Header.Hash()
 		err = blockState.AddBlockWithArrivalTime(block, arrivalTime)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		blockState.StoreRuntime(hash, rt)
 
@@ -226,7 +226,7 @@ func AddBlocksToStateWithFixedBranches(t *testing.T, blockState *BlockState, dep
 
 			hash := block.Header.Hash()
 			err = blockState.AddBlockWithArrivalTime(block, arrivalTime)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			blockState.StoreRuntime(hash, rt)
 
diff --git a/dot/sync/message_test.go b/dot/sync/message_test.go
index c8878b05d0..62eb74da39 100644
--- a/dot/sync/message_test.go
+++ b/dot/sync/message_test.go
@@ -19,7 +19,7 @@ import (
 func addTestBlocksToState(t *testing.T, depth int, blockState BlockState) {
 	previousHash := blockState.BestBlockHash()
 	previousNum, err := blockState.BestBlockNumber()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	digest := types.NewDigest()
 	prd, err := types.NewBabeSecondaryPlainPreDigest(0, 1).ToPreRuntimeDigest()
@@ -41,7 +41,7 @@ func addTestBlocksToState(t *testing.T, depth int, blockState BlockState) {
 		previousHash = block.Header.Hash()
 
 		err := blockState.AddBlock(block)
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}
 }
 
diff --git a/dot/utils.go b/dot/utils.go
index da09c76757..2c67588a5e 100644
--- a/dot/utils.go
+++ b/dot/utils.go
@@ -47,7 +47,7 @@ func NewTestGenesisRawFile(t *testing.T, cfg *Config) (filename string) {
 	fp := utils.GetGssmrGenesisRawPathTest(t)
 
 	gssmrGen, err := genesis.NewGenesisFromJSONRaw(fp)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	gen := &genesis.Genesis{
 		Name:       cfg.Global.Name,
@@ -58,7 +58,7 @@ func NewTestGenesisRawFile(t *testing.T, cfg *Config) (filename string) {
 	}
 
 	b, err := json.Marshal(gen)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = os.WriteFile(filename, b, os.ModePerm)
 	require.NoError(t, err)
@@ -71,7 +71,7 @@ func newTestGenesisFile(t *testing.T, cfg *Config) (filename string) {
 	fp := utils.GetGssmrGenesisPathTest(t)
 
 	gssmrGen, err := genesis.NewGenesisFromJSON(fp, 0)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	gen := &genesis.Genesis{
 		Name:       cfg.Global.Name,
@@ -98,7 +98,7 @@ func NewTestGenesisAndRuntime(t *testing.T) (filename string) {
 	runtimeFilePath := runtime.GetAbsolutePath(runtime.NODE_RUNTIME_FP)
 
 	runtimeData, err := os.ReadFile(filepath.Clean(runtimeFilePath))
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	gen := newTestGenesis(t)
 	hex := hex.EncodeToString(runtimeData)
diff --git a/lib/babe/build_integration_test.go b/lib/babe/build_integration_test.go
index 9f45248289..95a34dfcf9 100644
--- a/lib/babe/build_integration_test.go
+++ b/lib/babe/build_integration_test.go
@@ -399,12 +399,12 @@ func TestDecodeExtrinsicBody(t *testing.T) {
 	vtx := transaction.NewValidTransaction(ext, &transaction.Validity{})
 
 	body, err := extrinsicsToBody(inh, []*transaction.ValidTransaction{vtx})
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.NotNil(t, body)
 	require.Len(t, body, 3)
 
 	contains, err := body.HasExtrinsic(ext)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.True(t, contains)
 }
 
diff --git a/lib/blocktree/blocktree_test.go b/lib/blocktree/blocktree_test.go
index 40b7f80147..2d4dc7dec8 100644
--- a/lib/blocktree/blocktree_test.go
+++ b/lib/blocktree/blocktree_test.go
@@ -139,7 +139,7 @@ func createFlatTree(t *testing.T, number int) (*BlockTree, []common.Hash) {
 		hashes = append(hashes, hash)
 
 		err := bt.AddBlock(header, time.Unix(0, 0))
-		require.Nil(t, err)
+		require.NoError(t, err)
 		previousHash = hash
 	}
 
@@ -189,7 +189,7 @@ func TestBlockTree_AddBlock(t *testing.T) {
 
 	hash := header.Hash()
 	err := bt.AddBlock(header, time.Unix(0, 0))
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	node := bt.getNode(hash)
 
diff --git a/lib/common/hash_test.go b/lib/common/hash_test.go
index 83c5899fa5..0de0f0390b 100644
--- a/lib/common/hash_test.go
+++ b/lib/common/hash_test.go
@@ -57,7 +57,7 @@ func TestCustomMarshalJson(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(test.description, func(t *testing.T) {
 			byt, err := test.hash.MarshalJSON()
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.True(t, strings.Contains(string(byt), test.expected))
 		})
 	}
diff --git a/lib/common/variadic/uint64OrHash_test.go b/lib/common/variadic/uint64OrHash_test.go
index 3ba4250bbb..72e861a05b 100644
--- a/lib/common/variadic/uint64OrHash_test.go
+++ b/lib/common/variadic/uint64OrHash_test.go
@@ -79,7 +79,7 @@ func TestNewUint64OrHashFromBytes(t *testing.T) {
 			data := append([]byte{x.targetFirstByte}, x.targetHash...)
 
 			uint64OrHash := NewUint64OrHashFromBytes(data)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.NotNil(t, uint64OrHash)
 			require.IsType(t, x.expectedType, uint64OrHash.Value())
 			if x.expectedType == (uint64)(0) {
diff --git a/lib/keystore/helpers_test.go b/lib/keystore/helpers_test.go
index 1a2e4de22e..76442c6ba9 100644
--- a/lib/keystore/helpers_test.go
+++ b/lib/keystore/helpers_test.go
@@ -24,12 +24,12 @@ import (
 func TestLoadKeystore(t *testing.T) {
 	ks := NewBasicKeystore("test", crypto.Sr25519Type)
 	err := LoadKeystore("alice", ks)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, ks.Size())
 
 	ks = NewBasicKeystore("test", crypto.Ed25519Type)
 	err = LoadKeystore("bob", ks)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, ks.Size())
 }
 
@@ -259,23 +259,23 @@ func TestUnlockKeys(t *testing.T) {
 	testdir := t.TempDir()
 
 	keyfile, err := GenerateKeypair("sr25519", nil, testdir, testPassword)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	t.Log(keyfile)
 
 	ks := NewBasicKeystore("test", crypto.Sr25519Type)
 
 	err = UnlockKeys(ks, testdir, "0", string(testPassword))
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	priv, err := ReadFromFileAndDecrypt(keyfile, testPassword)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	pub, err := priv.Public()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	kp, err := PrivateKeyToKeypair(priv)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := ks.GetKeypair(pub)
 	if !reflect.DeepEqual(expected, kp) {
diff --git a/lib/runtime/types_test.go b/lib/runtime/types_test.go
index 98627f241d..771d5f7189 100644
--- a/lib/runtime/types_test.go
+++ b/lib/runtime/types_test.go
@@ -58,7 +58,7 @@ func TestInvalidSignatureBatch(t *testing.T) {
 
 	// Invalid Sign
 	sigData, err := common.HexToBytes("0x90f27b8b488db00b00606796d2987f6a5f59ae62ea05effe84fef5b8b0e549984a691139ad57a3f0b906637673aa2f63d1f55cb1a69199d4009eea23ceaddc9301") //nolint:lll
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	signature := &crypto.SignatureInfo{
 		PubKey:     key.Public().Encode(),
diff --git a/lib/runtime/wasmer/exports_test.go b/lib/runtime/wasmer/exports_test.go
index 7af22e54fd..1d43661a1a 100644
--- a/lib/runtime/wasmer/exports_test.go
+++ b/lib/runtime/wasmer/exports_test.go
@@ -39,7 +39,7 @@ func TestInstance_Version_NodeRuntime_v098(t *testing.T) {
 	instance := NewTestInstance(t, runtime.NODE_RUNTIME_v098)
 
 	version, err := instance.Version()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	t.Logf("SpecName: %s\n", version.SpecName())
 	t.Logf("ImplName: %s\n", version.ImplName())
@@ -102,7 +102,7 @@ func TestInstance_Version_PolkadotRuntime(t *testing.T) {
 	instance := NewTestInstance(t, runtime.POLKADOT_RUNTIME)
 
 	version, err := instance.Version()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	t.Logf("SpecName: %s\n", version.SpecName())
 	t.Logf("ImplName: %s\n", version.ImplName())
@@ -185,7 +185,7 @@ func TestInstance_Version_NodeRuntime(t *testing.T) {
 	instance := NewTestInstance(t, runtime.NODE_RUNTIME)
 
 	version, err := instance.Version()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	t.Logf("SpecName: %s\n", version.SpecName())
 	t.Logf("ImplName: %s\n", version.ImplName())
@@ -217,7 +217,7 @@ func TestInstance_Version_DevRuntime(t *testing.T) {
 	instance := NewTestInstance(t, runtime.DEV_RUNTIME)
 
 	version, err := instance.Version()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	t.Logf("SpecName: %s\n", version.SpecName())
 	t.Logf("ImplName: %s\n", version.ImplName())
diff --git a/tests/rpc/rpc_00_test.go b/tests/rpc/rpc_00_test.go
index 4253eed30e..368d66f847 100644
--- a/tests/rpc/rpc_00_test.go
+++ b/tests/rpc/rpc_00_test.go
@@ -45,7 +45,7 @@ func getResponse(t *testing.T, test *testCase) interface{} {
 	}
 
 	respBody, err := utils.PostRPC(test.method, utils.NewEndpoint(currentPort), test.params)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	target := reflect.New(reflect.TypeOf(test.expected)).Interface()
 	err = utils.DecodeRPC(t, respBody, target)
diff --git a/tests/rpc/rpc_01-system_test.go b/tests/rpc/rpc_01-system_test.go
index 75783dad2b..1599a88116 100644
--- a/tests/rpc/rpc_01-system_test.go
+++ b/tests/rpc/rpc_01-system_test.go
@@ -91,7 +91,7 @@ func TestSystemRPC(t *testing.T) {
 	nodes, err := utils.InitializeAndStartNodes(t, 3, utils.GenesisDefault, utils.ConfigDefault)
 
 	//use only first server for tests
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second) // give server a second to start
 
diff --git a/tests/rpc/rpc_02-author_test.go b/tests/rpc/rpc_02-author_test.go
index 8b691de5e3..07ab8da9d9 100644
--- a/tests/rpc/rpc_02-author_test.go
+++ b/tests/rpc/rpc_02-author_test.go
@@ -133,7 +133,7 @@ func TestAuthorRPC(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodes(t, 1, utils.GenesisDefault, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second) // give server a second to start
 
diff --git a/tests/rpc/rpc_03-chain_test.go b/tests/rpc/rpc_03-chain_test.go
index 8531333c06..6276b24fa8 100644
--- a/tests/rpc/rpc_03-chain_test.go
+++ b/tests/rpc/rpc_03-chain_test.go
@@ -58,7 +58,7 @@ func TestChainRPC(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodes(t, 1, utils.GenesisDev, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second * 5) // give server a few seconds to start
 
@@ -174,7 +174,7 @@ func TestChainSubscriptionRPC(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodesWebsocket(t, 1, utils.GenesisDev, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second) // give server a second to start
 
diff --git a/tests/rpc/rpc_04-offchain_test.go b/tests/rpc/rpc_04-offchain_test.go
index e610c95c38..52cabb20bc 100644
--- a/tests/rpc/rpc_04-offchain_test.go
+++ b/tests/rpc/rpc_04-offchain_test.go
@@ -37,7 +37,7 @@ func TestOffchainRPC(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodes(t, 1, utils.GenesisDefault, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second) // give server a second to start
 
diff --git a/tests/rpc/rpc_05-state_test.go b/tests/rpc/rpc_05-state_test.go
index 62d3620829..cd948c32b1 100644
--- a/tests/rpc/rpc_05-state_test.go
+++ b/tests/rpc/rpc_05-state_test.go
@@ -335,7 +335,7 @@ func TestRPCStructParamUnmarshal(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodes(t, 1, utils.GenesisDev, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	defer func() {
 		t.Log("going to tear down gossamer...")
@@ -352,7 +352,7 @@ func TestRPCStructParamUnmarshal(t *testing.T) {
 	}
 	t.Run(test.description, func(t *testing.T) {
 		respBody, err := utils.PostRPC(test.method, utils.NewEndpoint(nodes[0].RPCPort), test.params)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.NotContains(t, string(respBody), "json: cannot unmarshal")
 		fmt.Println(string(respBody))
 	})
diff --git a/tests/rpc/rpc_06-engine_test.go b/tests/rpc/rpc_06-engine_test.go
index 0be58704fe..688bffb192 100644
--- a/tests/rpc/rpc_06-engine_test.go
+++ b/tests/rpc/rpc_06-engine_test.go
@@ -32,7 +32,7 @@ func TestEngineRPC(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodes(t, 1, utils.GenesisDefault, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second) // give server a second to start
 
diff --git a/tests/rpc/rpc_07-payment_test.go b/tests/rpc/rpc_07-payment_test.go
index 5a46e43ace..1318028d93 100644
--- a/tests/rpc/rpc_07-payment_test.go
+++ b/tests/rpc/rpc_07-payment_test.go
@@ -27,7 +27,7 @@ func TestPaymentRPC(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodes(t, 1, utils.GenesisDefault, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second) // give server a second to start
 
diff --git a/tests/rpc/rpc_08-contracts_test.go b/tests/rpc/rpc_08-contracts_test.go
index 1b70f0e3ca..8f16fea724 100644
--- a/tests/rpc/rpc_08-contracts_test.go
+++ b/tests/rpc/rpc_08-contracts_test.go
@@ -32,7 +32,7 @@ func TestContractsRPC(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodes(t, 1, utils.GenesisDefault, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second) // give server a second to start
 
diff --git a/tests/rpc/rpc_09-babe_test.go b/tests/rpc/rpc_09-babe_test.go
index 496d875484..38b62ebb5a 100644
--- a/tests/rpc/rpc_09-babe_test.go
+++ b/tests/rpc/rpc_09-babe_test.go
@@ -27,7 +27,7 @@ func TestBabeRPC(t *testing.T) {
 
 	t.Log("starting gossamer...")
 	nodes, err := utils.InitializeAndStartNodes(t, 1, utils.GenesisDefault, utils.ConfigDefault)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	time.Sleep(time.Second) // give server a second to start
 
diff --git a/tests/rpc/system_integration_test.go b/tests/rpc/system_integration_test.go
index 51981a8b52..70871cdf19 100644
--- a/tests/rpc/system_integration_test.go
+++ b/tests/rpc/system_integration_test.go
@@ -54,11 +54,11 @@ func TestStableNetworkRPC(t *testing.T) {
 	for _, test := range testsCases {
 		t.Run(test.description, func(t *testing.T) {
 			respBody, err := utils.PostRPC(test.method, "http://"+utils.HOSTNAME+":"+utils.PORT, "{}")
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			target := reflect.New(reflect.TypeOf(test.expected)).Interface()
 			err = utils.DecodeRPC(t, respBody, target)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			switch v := target.(type) {
 			case *modules.SystemHealthResponse:
diff --git a/tests/utils/chain.go b/tests/utils/chain.go
index e4f791365a..b900e094bb 100644
--- a/tests/utils/chain.go
+++ b/tests/utils/chain.go
@@ -22,7 +22,7 @@ func GetChainHead(t *testing.T, node *Node) *types.Header {
 
 	header := new(modules.ChainBlockHeaderResponse)
 	err = DecodeRPC(t, respBody, header)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	return headerResponseToHeader(t, header)
 }