diff --git a/privval/tcp_test.go b/privval/tcp_test.go
index 528622f56..c407ef87e 100644
--- a/privval/tcp_test.go
+++ b/privval/tcp_test.go
@@ -26,10 +26,10 @@ func TestSocketPVAddress(t *testing.T) {
 	defer rs.Stop()
 
 	serverAddr, err := rs.privVal.GetAddress()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	clientAddr, err := sc.GetAddress()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, serverAddr, clientAddr)
 }
@@ -46,7 +46,7 @@ func TestSocketPVPubKey(t *testing.T) {
 	require.NoError(t, err)
 
 	privKey, err := rs.privVal.GetPubKey()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, privKey, clientKey)
 }
diff --git a/types/evidence_test.go b/types/evidence_test.go
index 5b6df0ec4..95de44301 100644
--- a/types/evidence_test.go
+++ b/types/evidence_test.go
@@ -69,7 +69,7 @@ func TestEvidence(t *testing.T) {
 	}
 
 	pubKey, err := val.GetPubKey()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	for _, c := range cases {
 		ev := &DuplicateVoteEvidence{
 			VoteA: c.vote1,
diff --git a/types/proposal_test.go b/types/proposal_test.go
index 05b73e3df..d267747b9 100644
--- a/types/proposal_test.go
+++ b/types/proposal_test.go
@@ -46,7 +46,7 @@ func TestProposalString(t *testing.T) {
 func TestProposalVerifySignature(t *testing.T) {
 	privVal := NewMockPV()
 	pubKey, err := privVal.GetPubKey()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	prop := NewProposal(
 		4, 2, 2,
diff --git a/types/protobuf_test.go b/types/protobuf_test.go
index e505a1538..00b53f80f 100644
--- a/types/protobuf_test.go
+++ b/types/protobuf_test.go
@@ -4,6 +4,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/golang/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 
@@ -143,7 +145,7 @@ func TestABCIEvidence(t *testing.T) {
 	blockID2 := makeBlockID([]byte("blockhash2"), 1000, []byte("partshash"))
 	const chainID = "mychain"
 	pubKey, err := val.GetPubKey()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	ev := &DuplicateVoteEvidence{
 		PubKey: pubKey,
 		VoteA:  makeVote(val, chainID, 0, 10, 2, 1, blockID),