diff --git a/lib/babe/babe_test.go b/lib/babe/babe_test.go
index 185a63eb02..03a3fd938c 100644
--- a/lib/babe/babe_test.go
+++ b/lib/babe/babe_test.go
@@ -172,7 +172,7 @@ func TestService_RunEpochLengthConfig(t *testing.T) {
 	}
 
 	babeService := createTestService(t, cfg)
-	require.Equal(t, babeService.epochLength, 5)
+	require.Equal(t, uint64(5), babeService.epochLength)
 }
 
 func TestService_SlotDuration(t *testing.T) {
diff --git a/lib/grandpa/message_handler_test.go b/lib/grandpa/message_handler_test.go
index 04e7f30dca..077c5fc1fb 100644
--- a/lib/grandpa/message_handler_test.go
+++ b/lib/grandpa/message_handler_test.go
@@ -239,6 +239,9 @@ func TestMessageHandler_CommitMessage_NoCatchUpRequest_ValidSig(t *testing.T) {
 	fm := gs.newCommitMessage(gs.head, round)
 	fm.Vote = NewVote(testHash, uint32(round))
 
+	err := st.Block.SetHeader(testHeader)
+	require.NoError(t, err)
+
 	h := NewMessageHandler(gs, st.Block)
 	out, err := h.handleMessage("", fm)
 	require.NoError(t, err)
@@ -325,7 +328,10 @@ func TestMessageHandler_CatchUpRequest_WithResponse(t *testing.T) {
 		number: 1,
 	}
 
-	err := gs.blockState.SetFinalizedHash(testHeader.Hash(), round, setID)
+	err := st.Block.SetHeader(testHeader)
+	require.NoError(t, err)
+
+	err = gs.blockState.SetFinalizedHash(testHeader.Hash(), round, setID)
 	require.NoError(t, err)
 	err = gs.blockState.(*state.BlockState).SetHeader(testHeader)
 	require.NoError(t, err)
diff --git a/lib/grandpa/message_test.go b/lib/grandpa/message_test.go
index f9b61282ec..bc985cd45f 100644
--- a/lib/grandpa/message_test.go
+++ b/lib/grandpa/message_test.go
@@ -97,7 +97,7 @@ func TestCommitMessageToConsensusMessage(t *testing.T) {
 }
 
 func TestNewCatchUpResponse(t *testing.T) {
-	gs, _ := newTestService(t)
+	gs, st := newTestService(t)
 
 	round := uint64(1)
 	setID := uint64(1)
@@ -111,7 +111,10 @@ func TestNewCatchUpResponse(t *testing.T) {
 		number: 1,
 	}
 
-	err := gs.blockState.SetFinalizedHash(testHeader.Hash(), round, setID)
+	err := st.Block.SetHeader(testHeader)
+	require.NoError(t, err)
+
+	err = gs.blockState.SetFinalizedHash(testHeader.Hash(), round, setID)
 	require.NoError(t, err)
 	err = gs.blockState.(*state.BlockState).SetHeader(testHeader)
 	require.NoError(t, err)