diff --git a/tests/roots/test-root/conf.py b/tests/roots/test-root/conf.py
index a23aec482..c25beb9f1 100644
--- a/tests/roots/test-root/conf.py
+++ b/tests/roots/test-root/conf.py
@@ -29,9 +29,6 @@ numfig = True
 
 rst_epilog = '.. |subst| replace:: global substitution'
 
-html_theme = 'testtheme'
-html_theme_path = ['.']
-html_theme_options = {'testopt': 'testoverride'}
 html_sidebars = {'**': 'customsb.html',
                  'contents': ['contentssb.html', 'localtoc.html',
                               'globaltoc.html']}
diff --git a/tests/roots/test-root/testtheme/layout.html b/tests/roots/test-theming/test_theme/staticfiles/layout.html
similarity index 100%
rename from tests/roots/test-root/testtheme/layout.html
rename to tests/roots/test-theming/test_theme/staticfiles/layout.html
diff --git a/tests/roots/test-root/testtheme/static/staticimg.png b/tests/roots/test-theming/test_theme/staticfiles/static/staticimg.png
similarity index 100%
rename from tests/roots/test-root/testtheme/static/staticimg.png
rename to tests/roots/test-theming/test_theme/staticfiles/static/staticimg.png
diff --git a/tests/roots/test-root/testtheme/static/statictmpl.html_t b/tests/roots/test-theming/test_theme/staticfiles/static/statictmpl.html_t
similarity index 100%
rename from tests/roots/test-root/testtheme/static/statictmpl.html_t
rename to tests/roots/test-theming/test_theme/staticfiles/static/statictmpl.html_t
diff --git a/tests/roots/test-root/testtheme/theme.conf b/tests/roots/test-theming/test_theme/staticfiles/theme.conf
similarity index 100%
rename from tests/roots/test-root/testtheme/theme.conf
rename to tests/roots/test-theming/test_theme/staticfiles/theme.conf
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index ceeb5f01c..6fa769b8b 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -377,7 +377,6 @@ def test_static_output(app):
     'contents.html': [
         (".//meta[@name='hc'][@content='hcval']", ''),
         (".//meta[@name='hc_co'][@content='hcval_co']", ''),
-        (".//meta[@name='testopt'][@content='testoverride']", ''),
         (".//td[@class='label']", r'\[Ref1\]'),
         (".//td[@class='label']", ''),
         (".//li[@class='toctree-l1']/a", 'Testing various markup'),
@@ -410,9 +409,6 @@ def test_static_output(app):
         (".//a[@href='http://bugs.python.org/issue1000']", "issue 1000"),
         (".//a[@href='http://bugs.python.org/issue1042']", "explicit caption"),
     ],
-    '_static/statictmpl.html': [
-        (".//project", 'Sphinx <Tests>'),
-    ],
     'genindex.html': [
         # index entries
         (".//a/strong", "Main"),
diff --git a/tests/test_build_html5.py b/tests/test_build_html5.py
index 7fc91b9ec..4ad282973 100644
--- a/tests/test_build_html5.py
+++ b/tests/test_build_html5.py
@@ -252,7 +252,6 @@ def cached_etree_parse():
     'contents.html': [
         (".//meta[@name='hc'][@content='hcval']", ''),
         (".//meta[@name='hc_co'][@content='hcval_co']", ''),
-        (".//meta[@name='testopt'][@content='testoverride']", ''),
         (".//dt[@class='label']/span[@class='brackets']", r'Ref1'),
         (".//dt[@class='label']", ''),
         (".//li[@class='toctree-l1']/a", 'Testing various markup'),
@@ -285,9 +284,6 @@ def cached_etree_parse():
         (".//a[@href='http://bugs.python.org/issue1000']", "issue 1000"),
         (".//a[@href='http://bugs.python.org/issue1042']", "explicit caption"),
     ],
-    '_static/statictmpl.html': [
-        (".//project", 'Sphinx <Tests>'),
-    ],
     'genindex.html': [
         # index entries
         (".//a/strong", "Main"),
diff --git a/tests/test_theming.py b/tests/test_theming.py
index f8cfd395e..176c9eebc 100644
--- a/tests/test_theming.py
+++ b/tests/test_theming.py
@@ -26,10 +26,11 @@ def test_theme_api(app, status, warning):
     # test Theme class API
     assert set(app.html_themes.keys()) == \
         set(['basic', 'default', 'scrolls', 'agogo', 'sphinxdoc', 'haiku',
-             'traditional', 'test-theme', 'ziptheme', 'epub', 'nature',
-             'pyramid', 'bizstyle', 'classic', 'nonav', 'parent', 'child'])
-    assert app.html_themes['test-theme'] == app.srcdir / 'test_theme/test-theme'
+             'traditional', 'epub', 'nature', 'pyramid', 'bizstyle', 'classic', 'nonav',
+             'test-theme', 'ziptheme', 'staticfiles', 'parent', 'child'])
+    assert app.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
     assert app.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
+    assert app.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'
 
     # test Theme instance API
     theme = app.builder.theme
@@ -94,3 +95,18 @@ def test_double_inheriting_theme(app, status, warning):
 def test_nested_zipped_theme(app, status, warning):
     assert app.builder.theme.name == 'child'
     app.build()  # => not raises TemplateNotFound
+
+
+@pytest.mark.sphinx(testroot='theming',
+                    confoverrides={'html_theme': 'staticfiles'})
+def test_staticfiles(app, status, warning):
+    app.build()
+    assert (app.outdir / '_static' / 'staticimg.png').exists()
+    assert (app.outdir / '_static' / 'statictmpl.html').exists()
+    assert (app.outdir / '_static' / 'statictmpl.html').text() == (
+        '<!-- testing static templates -->\n'
+        '<html><project>Python</project></html>'
+    )
+
+    result = (app.outdir / 'index.html').text()
+    assert '<meta name="testopt" content="optdefault" />' in result