diff --git a/Gemfile b/Gemfile
index d1a1e3234..101b842c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -72,6 +72,7 @@ end
 group :test do
   gem 'capybara'
   gem 'faker'
+  gem 'microformats2'
   gem 'rails-controller-testing'
   gem 'rspec-sidekiq'
   gem 'simplecov', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 430e20440..8d04a474c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,6 +240,10 @@ GEM
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
+    microformats2 (2.1.0)
+      activesupport
+      json
+      nokogiri
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -499,6 +503,7 @@ DEPENDENCIES
   letter_opener_web
   link_header
   lograge
+  microformats2
   nokogiri
   oj
   ostatus2
diff --git a/spec/views/accounts/show.html.haml_spec.rb b/spec/views/accounts/show.html.haml_spec.rb
new file mode 100644
index 000000000..8265b2f4d
--- /dev/null
+++ b/spec/views/accounts/show.html.haml_spec.rb
@@ -0,0 +1,67 @@
+require 'rails_helper'
+$LOAD_PATH << '../lib'
+require 'tag_manager'
+
+describe "stream_entries/show.html.haml" do
+
+  before do
+    double(:api_oembed_url => '')
+    double(:account_stream_entry_url => '')
+  end
+
+  it "has valid author h-card and basic data for a detailed_status" do
+    alice  =  Fabricate(:account, username: 'alice', display_name: 'Alice')
+    bob    =  Fabricate(:account, username: 'bob', display_name: 'Bob')
+    status =  Fabricate(:status, account: alice, text: 'Hello World')
+    reply  =  Fabricate(:status, account: bob, thread: status, text: 'Hello Alice')
+
+    assign(:status, status)
+    assign(:stream_entry, status.stream_entry)
+    assign(:account, alice)
+    assign(:type, status.stream_entry.activity_type.downcase)
+
+    render(:template => 'stream_entries/show.html.haml')
+
+    mf2 = Microformats2.parse(rendered)
+
+    expect(mf2.entry.name.to_s).to eq status.text
+    expect(mf2.entry.url.to_s).not_to be_empty
+
+    expect(mf2.entry.author.format.name.to_s).to eq alice.display_name
+    expect(mf2.entry.author.format.url.to_s).not_to be_empty
+  end
+
+  it "has valid h-cites for p-in-reply-to and p-comment" do
+    alice   =  Fabricate(:account, username: 'alice', display_name: 'Alice')
+    bob     =  Fabricate(:account, username: 'bob', display_name: 'Bob')
+    carl    =  Fabricate(:account, username: 'carl', display_name: 'Carl')
+    status  =  Fabricate(:status, account: alice, text: 'Hello World')
+    reply   =  Fabricate(:status, account: bob, thread: status, text: 'Hello Alice')
+    comment =  Fabricate(:status, account: carl, thread: reply, text: 'Hello Bob')
+
+    assign(:status, reply)
+    assign(:stream_entry, reply.stream_entry)
+    assign(:account, alice)
+    assign(:type, reply.stream_entry.activity_type.downcase)
+    assign(:ancestors, reply.stream_entry.activity.ancestors(bob) )
+    assign(:descendants, reply.stream_entry.activity.descendants(bob))
+
+    render(:template => 'stream_entries/show.html.haml')
+
+    mf2 = Microformats2.parse(rendered)
+
+    expect(mf2.entry.name.to_s).to eq reply.text
+    expect(mf2.entry.url.to_s).not_to be_empty
+
+    expect(mf2.entry.comment.format.url.to_s).not_to be_empty
+    expect(mf2.entry.comment.format.author.format.name.to_s).to eq carl.display_name
+    expect(mf2.entry.comment.format.author.format.url.to_s).not_to be_empty
+
+    expect(mf2.entry.in_reply_to.format.url.to_s).not_to be_empty
+    expect(mf2.entry.in_reply_to.format.author.format.name.to_s).to eq alice.display_name
+    expect(mf2.entry.in_reply_to.format.author.format.url.to_s).not_to be_empty
+  end
+
+end
+
+
diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb
new file mode 100644
index 000000000..18814e785
--- /dev/null
+++ b/spec/views/stream_entries/show.html.haml_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+describe "accounts/show.html.haml" do
+
+  it "has an h-feed with correct number of h-entry objects in it" do
+    alice   =  Fabricate(:account, username: 'alice', display_name: 'Alice')
+    status  =  Fabricate(:status, account: alice, text: 'Hello World')
+    status2 =  Fabricate(:status, account: alice, text: 'Hello World Again')
+    status3 =  Fabricate(:status, account: alice, text: 'Are You Still There World?')
+
+    assign(:account, alice)
+    assign(:statuses, alice.statuses)
+
+    render(:template => 'accounts/show.html.haml')
+
+    expect(Nokogiri::HTML(rendered).search('.h-feed .h-entry').size).to eq 3
+
+  end
+
+end
+
+