diff --git a/agent_test.go b/agent_test.go
index 3377729..7a6261a 100644
--- a/agent_test.go
+++ b/agent_test.go
@@ -1694,3 +1694,11 @@ func TestNilCandidate(t *testing.T) {
 	assert.NoError(t, a.AddRemoteCandidate(nil))
 	assert.NoError(t, a.Close())
 }
+
+func TestNilCandidatePair(t *testing.T) {
+	a, err := NewAgent(&AgentConfig{})
+	assert.NoError(t, err)
+
+	a.setSelectedPair(nil)
+	assert.NoError(t, a.Close())
+}
diff --git a/candidatepair_test.go b/candidatepair_test.go
index 70788c1..1d817c1 100644
--- a/candidatepair_test.go
+++ b/candidatepair_test.go
@@ -1,6 +1,10 @@
 package ice
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
 
 func hostCandidate() *CandidateHost {
 	return &CandidateHost{
@@ -125,8 +129,5 @@ func TestCandidatePairEquality(t *testing.T) {
 
 func TestNilCandidatePairString(t *testing.T) {
 	var nilCandidatePair *candidatePair
-
-	if res := nilCandidatePair.String(); res != "" {
-		t.Fatalf("Expected %v to equal %v", res, "")
-	}
+	assert.Equal(t, nilCandidatePair.String(), "")
 }