diff --git a/server/events/events_suite_test.go b/server/events/events_suite_test.go
new file mode 100644
index 000000000..7ee42804f
--- /dev/null
+++ b/server/events/events_suite_test.go
@@ -0,0 +1,17 @@
+package events
+
+import (
+	"testing"
+
+	"github.com/deluan/navidrome/log"
+	"github.com/deluan/navidrome/tests"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestEvents(t *testing.T) {
+	tests.Init(t, false)
+	log.SetLevel(log.LevelCritical)
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Events Suite")
+}
diff --git a/server/events/events_test.go b/server/events/events_test.go
new file mode 100644
index 000000000..c52e40747
--- /dev/null
+++ b/server/events/events_test.go
@@ -0,0 +1,19 @@
+package events
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Event", func() {
+	It("marshals Event to JSON", func() {
+		testEvent := TestEvent{Test: "some data"}
+		json := testEvent.Prepare(&testEvent)
+		Expect(json).To(Equal(`{"name":"testEvent","Test":"some data"}`))
+	})
+})
+
+type TestEvent struct {
+	baseEvent
+	Test string
+}