diff --git a/tests/_support/vanilla/conf.py b/tests/_support/conf.py
similarity index 100%
rename from tests/_support/vanilla/conf.py
rename to tests/_support/conf.py
diff --git a/tests/integration.py b/tests/integration.py
index 2ef4e4c..2ff7ba3 100644
--- a/tests/integration.py
+++ b/tests/integration.py
@@ -14,17 +14,17 @@ class integration(Spec):
 
     def vanilla_invocation(self):
         # Doctree with just-a-changelog-named-changelog
-        os.chdir('tests/_support/vanilla')
+        os.chdir('tests/_support')
         try:
-            result = run('sphinx-build -W . _build', warn=True, hide=True)
+            result = run('sphinx-build -c . -W vanilla vanilla/_build', warn=True, hide=True)
             msg = "Build failed w/ stderr: {0}"
             assert result.ok, msg.format(result.stderr)
-            with open('_build/changelog.html') as fd:
+            with open('vanilla/_build/changelog.html') as fd:
                 text = fd.read()
                 assert "1.0.1" in text
                 assert "#1" in text
         finally:
-            shutil.rmtree('_build')
+            shutil.rmtree('vanilla/_build')
 
     def vanilla_with_other_files(self):
         # Same but w/ other files in toctree