diff --git a/lib/diaspora/taggable.rb b/lib/diaspora/taggable.rb
index 13c9bb811..bbf725532 100644
--- a/lib/diaspora/taggable.rb
+++ b/lib/diaspora/taggable.rb
@@ -50,7 +50,7 @@ module Diaspora
           url_bit = '<3'
         end
 
-        %{#{pre}<a href="/tags/#{url_bit}" class="tag">#{clickable}</a>}
+        %{#{pre}<a class="tag" href="/tags/#{url_bit}">#{clickable}</a>}
       }.html_safe
     end
   end
diff --git a/spec/lib/diaspora/mentionable_spec.rb b/spec/lib/diaspora/mentionable_spec.rb
index 6e60804a0..5d9bdcc45 100644
--- a/spec/lib/diaspora/mentionable_spec.rb
+++ b/spec/lib/diaspora/mentionable_spec.rb
@@ -48,7 +48,7 @@ STR
         fmt_msg = Diaspora::Mentionable.format(@status_msg.raw_message, @people)
 
         fmt_msg.should_not include(p.first_name)
-        fmt_msg.should include("&gt;", "&lt;", "&#x27;") # ">", "<", "'"
+        fmt_msg.should include("&gt;", "&lt;", "&#39;") # ">", "<", "'"
       end
     end
 
diff --git a/spec/shared_behaviors/taggable.rb b/spec/shared_behaviors/taggable.rb
index 339556bf2..95b202352 100644
--- a/spec/shared_behaviors/taggable.rb
+++ b/spec/shared_behaviors/taggable.rb
@@ -52,9 +52,9 @@ shared_examples_for "it is taggable" do
         '#12345 tag'             => "#{tag_link('12345')} tag",
         '#12cde tag'             => "#{tag_link('12cde')} tag",
         '#abc45 tag'             => "#{tag_link('abc45')} tag",
-        '#<3'                    => %{<a href="/tags/<3" class="tag">#&lt;3</a>},
-        'i #<3'                  => %{i <a href="/tags/<3" class="tag">#&lt;3</a>},
-        'i #<3 you'              => %{i <a href="/tags/<3" class="tag">#&lt;3</a> you},
+        '#<3'                    => %{<a class="tag" href="/tags/<3">#&lt;3</a>},
+        'i #<3'                  => %{i <a class="tag" href="/tags/<3">#&lt;3</a>},
+        'i #<3 you'              => %{i <a class="tag" href="/tags/<3">#&lt;3</a> you},
         '#<4'                    => '#&lt;4',
         'test#foo test'          => 'test#foo test',
         'test.#joo bar'          => 'test.#joo bar',