diff --git a/setup.cfg b/setup.cfg
index 7f7903b..0af504d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ astropy_header = true
 doctest_plus = enabled
 doctest_rst = true
 text_file_format = rst
-addopts = --doctest-rst --doctest-ignore-import-errors --import-mode append
+addopts = --import-mode append
 xfail_strict = true
 filterwarnings =
     ignore:can't resolve package from __spec__
diff --git a/tox.ini b/tox.ini
index 86e8dd7..2249038 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,11 +53,11 @@ extras =
 
 commands =
     pip freeze
-    !cov: pytest --pyargs synphot {toxinidir}/docs {posargs}
     # FIXME: Seems like using -c option with multiline Pytest is broken: see
     # https://github.com/tox-dev/tox-travis/issues/146
     # at the very least on CI - it runs fine locally on MacOSX.
-    cov: pytest --rootdir={toxinidir} -c {toxinidir}/setup.cfg --pyargs synphot --cov={envsitepackagesdir}/synphot --cov-config={toxinidir}/setup.cfg {posargs} --cov-report xml:{toxinidir}/coverage.xml
+    !cov: pytest -c {toxinidir}/setup.cfg --pyargs synphot --rootdir={toxinidir} {posargs}
+    cov: pytest -c {toxinidir}/setup.cfg --pyargs synphot --rootdir={toxinidir} {posargs} --cov={envsitepackagesdir}/synphot --cov-config={toxinidir}/setup.cfg --cov-report xml:{toxinidir}/coverage.xml
 
 [testenv:codestyle]
 skip_install = true