diff --git a/spec/serializers/speaker_serializer_spec.rb b/spec/serializers/speaker_serializer_spec.rb
new file mode 100644
index 00000000..a62c882c
--- /dev/null
+++ b/spec/serializers/speaker_serializer_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+describe SpeakerSerializer, type: :serializer do
+  let(:speaker) { create(:user, name: 'John Doe', affiliation: 'JohnDoesInc', biography: nil) }
+  let(:serializer) { SpeakerSerializer.new(speaker) }
+
+  context 'speaker does not have biography' do
+    it 'sets name and affiliation' do
+      expected_json = {
+        speaker: {
+          name: 'John Doe',
+          affiliation: 'JohnDoesInc',
+          biography: nil
+        }
+      }.to_json
+
+      expect(serializer.to_json).to eq expected_json
+    end
+  end
+
+  context 'speaker has biography' do
+    before{ speaker.update_attributes(biography: 'Doest of all Jon Does') }
+
+    it 'sets name, affiliation and biography' do
+      expected_json = {
+        speaker: {
+          name: 'John Doe',
+          affiliation: 'JohnDoesInc',
+          biography: '<p>Doest of all Jon Does</p>'
+        }
+      }.to_json
+
+      expect(serializer.to_json).to eq expected_json
+    end
+  end
+end