diff --git a/event/event_cache_test.g_ b/event/event_cache_test.go
similarity index 97%
rename from event/event_cache_test.g_
rename to event/event_cache_test.go
index e65e99c1128bd386ae738f598670e889942855d5..9c1cd06e402209140b429df0367d06aa0218a5ee 100644
--- a/event/event_cache_test.g_
+++ b/event/event_cache_test.go
@@ -1,6 +1,3 @@
-// TODO: test has been disabled and needs to be re-enabled; tracked in issue
-// https://github.com/eris-ltd/eris-db/issues/238
-
 package event
 
 import (
@@ -31,6 +28,8 @@ type mockEventData struct {
 	eventId string
 }
 
+func (eventData mockEventData) AssertIsEventData() { }
+
 // A mock event
 func newMockSub(subId, eventId string, f func(txs.EventData)) mockSub {
 	return mockSub{subId, eventId, f, false, make(chan struct{})}
diff --git a/event/events_test.g_ b/event/events_test.go
similarity index 89%
rename from event/events_test.g_
rename to event/events_test.go
index 3b634bcfa906f20f71a36ce5e62de823f7a1364e..51d185ecb0ad5c012c528c2cf1eeb7e3165ab182 100644
--- a/event/events_test.g_
+++ b/event/events_test.go
@@ -1,6 +1,3 @@
-// TODO: test has been disabled and needs to be re-enabled; tracked in issue
-// https://github.com/eris-ltd/eris-db/issues/238
-
 package event
 
 import (
@@ -9,9 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-	evts "github.com/tendermint/go-events"
 	"github.com/eris-ltd/eris-db/txs"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestMultiplexedEvents(t *testing.T) {