diff --git a/html5lib/html5parser.py b/html5lib/html5parser.py
index dab175dd..f508eae2 100644
--- a/html5lib/html5parser.py
+++ b/html5lib/html5parser.py
@@ -886,7 +886,7 @@ def __init__(self, parser, tree):
                 ("frameset", self.startTagFrameset),
                 (("address", "article", "aside", "blockquote", "center", "details",
                   "details", "dir", "div", "dl", "fieldset", "figcaption", "figure",
-                  "footer", "header", "hgroup", "menu", "nav", "ol", "p",
+                  "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p",
                   "section", "summary", "ul"),
                  self.startTagCloseP),
                 (headingElements, self.startTagHeading),
@@ -928,8 +928,8 @@ def __init__(self, parser, tree):
                 ("html", self.endTagHtml),
                 (("address", "article", "aside", "blockquote", "center",
                   "details", "dir", "div", "dl", "fieldset", "figcaption", "figure",
-                  "footer", "header", "hgroup", "listing", "menu", "nav", "ol", "pre",
-                  "section", "summary", "ul"), self.endTagBlock),
+                  "footer", "header", "hgroup", "listing", "main", "menu", "nav", "ol",
+                  "pre", "section", "summary", "ul"), self.endTagBlock),
                 ("form", self.endTagForm),
                 ("p", self.endTagP),
                 (("dd", "dt", "li"), self.endTagListItem),
diff --git a/html5lib/tests/test_parser.py b/html5lib/tests/test_parser.py
index ce117148..35e0fd5e 100644
--- a/html5lib/tests/test_parser.py
+++ b/html5lib/tests/test_parser.py
@@ -79,7 +79,7 @@ def test_parser():
 
     for filename in files:
         testName = os.path.basename(filename).replace(".dat", "")
-        if testName in ("main-element", "template"):
+        if testName in ("template",):
             continue
 
         tests = TestData(filename, "data")
diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
index 7f7853ed..fa1ddb58 100644
--- a/html5lib/tests/test_treewalkers.py
+++ b/html5lib/tests/test_treewalkers.py
@@ -300,7 +300,7 @@ def test_treewalker():
         files = get_data_files('tree-construction')
         for filename in files:
             testName = os.path.basename(filename).replace(".dat", "")
-            if testName in ("main-element", "template"):
+            if testName in ("template",):
                 continue
 
             tests = TestData(filename, "data")