diff --git a/lib/liquid/block.rb b/lib/liquid/block.rb
index 327b642f..e6384c0d 100644
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -5,6 +5,11 @@ module Liquid
     FullToken         = /\A#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/o
     ContentOfVariable = /\A#{VariableStart}(.*)#{VariableEnd}\z/o
 
+    def initialize(tag_name, markup, tokens)
+      super
+      parse(tokens)
+    end
+
     def blank?
       @blank || false
     end
diff --git a/lib/liquid/tag.rb b/lib/liquid/tag.rb
index 83dc7300..9758fb0a 100644
--- a/lib/liquid/tag.rb
+++ b/lib/liquid/tag.rb
@@ -16,10 +16,6 @@ module Liquid
       @tag_name   = tag_name
       @markup     = markup
       @options    ||= {} # needs || because might be set before initialize
-      parse(tokens)
-    end
-
-    def parse(tokens)
     end
 
     def name
diff --git a/lib/liquid/tags/include.rb b/lib/liquid/tags/include.rb
index d439fff8..6f59231f 100644
--- a/lib/liquid/tags/include.rb
+++ b/lib/liquid/tags/include.rb
@@ -35,9 +35,6 @@ module Liquid
       super
     end
 
-    def parse(tokens)
-    end
-
     def blank?
       false
     end