diff --git a/internal/consensus/pbts_test.go b/internal/consensus/pbts_test.go
index 38da71bf3..ed2e44efb 100644
--- a/internal/consensus/pbts_test.go
+++ b/internal/consensus/pbts_test.go
@@ -436,7 +436,7 @@ func TestTimelyProposal(t *testing.T) {
 		},
 		timeoutPropose:             40 * time.Millisecond,
 		genesisTime:                initialTime,
-		height2ProposedBlockTime:   initialTime.Add(5 * time.Millisecond),
+		height2ProposedBlockTime:   initialTime.Add(15 * time.Millisecond),
 		height2ProposalDeliverTime: initialTime.Add(30 * time.Millisecond),
 	}
 
@@ -455,7 +455,7 @@ func TestTooFarInThePastProposal(t *testing.T) {
 	cfg := pbtsTestConfiguration{
 		timingParams: types.TimingParams{
 			Precision:    1 * time.Millisecond,
-			MessageDelay: 10 * time.Millisecond,
+			MessageDelay: 1 * time.Millisecond,
 		},
 		timeoutPropose:             50 * time.Millisecond,
 		genesisTime:                initialTime,
diff --git a/types/block.go b/types/block.go
index dcae746a3..c586446e0 100644
--- a/types/block.go
+++ b/types/block.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	gogotypes "github.com/gogo/protobuf/types"
-
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/merkle"
 	"github.com/tendermint/tendermint/crypto/tmhash"