diff --git a/agent_test.go b/agent_test.go
index 655c608df..e7ca05860 100644
--- a/agent_test.go
+++ b/agent_test.go
@@ -6,74 +6,75 @@ import (
 	"github.com/influxdb/tivan/plugins"
 	"github.com/stretchr/testify/require"
 	"github.com/vektra/cypress"
-	"github.com/vektra/neko"
 )
 
-func TestAgent(t *testing.T) {
-	n := neko.Start(t)
-
+func TestAgent_DrivesMetrics(t *testing.T) {
 	var (
 		plugin  plugins.MockPlugin
 		metrics MockMetrics
 	)
 
-	n.CheckMock(&plugin.Mock)
-	n.CheckMock(&metrics.Mock)
+	defer plugin.AssertExpectations(t)
+	defer metrics.AssertExpectations(t)
 
-	n.It("drives the plugins and sends them to the metrics", func() {
-		a := &Agent{
-			plugins: []plugins.Plugin{&plugin},
-			metrics: &metrics,
-			Config:  &Config{},
-		}
+	a := &Agent{
+		plugins: []plugins.Plugin{&plugin},
+		metrics: &metrics,
+		Config:  &Config{},
+	}
 
-		m1 := cypress.Metric()
-		m1.Add("name", "foo")
-		m1.Add("value", 1.2)
+	m1 := cypress.Metric()
+	m1.Add("name", "foo")
+	m1.Add("value", 1.2)
 
-		m2 := cypress.Metric()
-		m2.Add("name", "bar")
-		m2.Add("value", 888)
+	m2 := cypress.Metric()
+	m2.Add("name", "bar")
+	m2.Add("value", 888)
 
-		msgs := []*cypress.Message{m1, m2}
+	msgs := []*cypress.Message{m1, m2}
 
-		plugin.On("Read").Return(msgs, nil)
-		metrics.On("Receive", m1).Return(nil)
-		metrics.On("Receive", m2).Return(nil)
+	plugin.On("Read").Return(msgs, nil)
+	metrics.On("Receive", m1).Return(nil)
+	metrics.On("Receive", m2).Return(nil)
 
-		err := a.crank()
-		require.NoError(t, err)
-	})
-
-	n.It("applies tags as the messages pass through", func() {
-		a := &Agent{
-			plugins: []plugins.Plugin{&plugin},
-			metrics: &metrics,
-			Config: &Config{
-				Tags: map[string]string{
-					"dc": "us-west-1",
-				},
-			},
-		}
-
-		m1 := cypress.Metric()
-		m1.Add("name", "foo")
-		m1.Add("value", 1.2)
-
-		msgs := []*cypress.Message{m1}
-
-		m2 := cypress.Metric()
-		m2.Timestamp = m1.Timestamp
-		m2.Add("name", "foo")
-		m2.Add("value", 1.2)
-		m2.AddTag("dc", "us-west-1")
-
-		plugin.On("Read").Return(msgs, nil)
-		metrics.On("Receive", m2).Return(nil)
-
-		err := a.crank()
-		require.NoError(t, err)
-	})
-
-	n.Meow()
+	err := a.crank()
+	require.NoError(t, err)
+}
+
+func TestAgent_AppliesTags(t *testing.T) {
+	var (
+		plugin  plugins.MockPlugin
+		metrics MockMetrics
+	)
+
+	defer plugin.AssertExpectations(t)
+	defer metrics.AssertExpectations(t)
+
+	a := &Agent{
+		plugins: []plugins.Plugin{&plugin},
+		metrics: &metrics,
+		Config: &Config{
+			Tags: map[string]string{
+				"dc": "us-west-1",
+			},
+		},
+	}
+
+	m1 := cypress.Metric()
+	m1.Add("name", "foo")
+	m1.Add("value", 1.2)
+
+	msgs := []*cypress.Message{m1}
+
+	m2 := cypress.Metric()
+	m2.Timestamp = m1.Timestamp
+	m2.Add("name", "foo")
+	m2.Add("value", 1.2)
+	m2.AddTag("dc", "us-west-1")
+
+	plugin.On("Read").Return(msgs, nil)
+	metrics.On("Receive", m2).Return(nil)
+
+	err := a.crank()
+	require.NoError(t, err)
 }