diff --git a/setup.cfg b/setup.cfg
index be65964ee9a..66e6dd843d5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,17 @@
 [tool:pytest]
 norecursedirs = .* *.egg* build dist conda/_vendor/* conda-env/*
 addopts =
+    --doctest-modules conda/common
     --ignore setup.py
     --cov conda
     --cov-report xml
     --tb native
     --strict
     --durations 8
+doctest_optionflags =
+    NORMALIZE_WHITESPACE
+    IGNORE_EXCEPTION_DETAIL
+    ALLOW_UNICODE
 markers =
     slow: slow running tests
     installed: tests that assume conda is pre-installed on PATH