diff --git a/sphinx/templates/quickstart/conf.py_t b/sphinx/templates/quickstart/conf.py_t
index d1ba65713..d5773881f 100644
--- a/sphinx/templates/quickstart/conf.py_t
+++ b/sphinx/templates/quickstart/conf.py_t
@@ -64,7 +64,7 @@ templates_path = ['{{ dot }}templates']
 source_suffix = {{ suffix | repr }}
 
 {% endif -%}
-{% if master_doc != 'index' -%}
+{% if master != 'index' -%}
 # The master toctree document.
 master_doc = {{ master | repr }}
 
diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index f3563be50..bd7e2cb2f 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -112,7 +112,6 @@ def test_quickstart_defaults(tempdir):
     execfile_(conffile, ns)
     assert ns['extensions'] == []
     assert ns['templates_path'] == ['_templates']
-    assert ns['master_doc'] == 'index'
     assert ns['project'] == 'Sphinx Test'
     assert ns['copyright'] == '%s, Georg Brandl' % time.strftime('%Y')
     assert ns['version'] == '0.1'