diff --git a/spec/codecs/oldlogstashjson.rb b/spec/codecs/oldlogstashjson.rb
new file mode 100644
index 000000000..3a4a07246
--- /dev/null
+++ b/spec/codecs/oldlogstashjson.rb
@@ -0,0 +1,41 @@
+require "logstash/codecs/oldlogstashjson"
+require "logstash/event"
+require "insist"
+
+describe LogStash::Codecs::OldLogStashJSON do
+  subject do
+    next LogStash::Codecs::OldLogStashJSON.new
+  end
+
+  context "#decode" do
+    it "should return a new (v1) event from old (v0) json data" do
+      data = {"@message" => "bar", "@source_host" => "localhost",
+              "@tags" => ["a","b","c"]}
+      subject.decode(data.to_json) do |event|
+        insist { event.is_a? LogStash::Event }
+        insist { event["@timestamp"].nil? }
+        insist { event["type"] } == data["@type"]
+        insist { event["message"] } == data["@message"]
+        insist { event["host"] } == data["@source_host"]
+        insist { event["tags"] } == data["@tags"]
+      end
+    end
+  end
+
+  context "#encode" do
+    it "should return old (v0) json data" do
+      data = {"type" => "t", "message" => "wat!?",
+              "host" => "localhost", "path" => "/foo",
+              "tags" => ["a","b","c"]}
+      event = LogStash::Event.new(data)
+      got_event = false
+      subject.on_event do |d|
+        insist { !d["@timestamp"].nil? }
+        insist { d["@message"] } == data["message"]
+        got_event = true
+      end
+      subject.encode(event)
+      insist { got_event }
+    end
+  end
+end