diff --git a/net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/TestEventDispatcher.java b/net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/TestEventDispatcher.java
new file mode 100644
index 0000000..82f8be5
--- /dev/null
+++ b/net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/TestEventDispatcher.java
@@ -0,0 +1,24 @@
+package org.onlab.onos.net.trivial.impl;
+
+import org.onlab.onos.event.DefaultEventSinkRegistry;
+import org.onlab.onos.event.Event;
+import org.onlab.onos.event.EventDeliveryService;
+import org.onlab.onos.event.EventSink;
+
+import static com.google.common.base.Preconditions.checkState;
+
+/**
+ * Implements event delivery system that delivers events synchronously, or
+ * in-line with the post method invocation.
+ */
+public class TestEventDispatcher extends DefaultEventSinkRegistry
+        implements EventDeliveryService {
+
+    @Override
+    public void post(Event event) {
+        EventSink sink = getSink(event.getClass());
+        checkState(sink != null, "No sink for event %s", event);
+        sink.process(event);
+    }
+
+}