@@ -34,8 +34,8 @@ before_install:
   - export LD_LIBRARY_PATH=$PY_LIBDIR:$LD_LIBRARY_PATH
 
 install:
-  - pip install --upgrade pycparser coverage codecov pytest
-  # setup.py install works too, but need to deal w Python.test then
+  - pip install --upgrade -r requirements.txt
+  # `setup.py install` works too, but need to deal with `Python.Test` PATH
   - coverage run setup.py build_ext --inplace
 
 script:
 
@@ -40,10 +40,9 @@ init:
   - python -c "import ctypes; print(ctypes.sizeof(ctypes.c_wchar))"
 
 install:
-  # install for wheels & coverage
-  - pip install --upgrade pip wheel coverage codecov pytest
+  - pip install --upgrade -r requirements.txt
 
-  # Install OpenCover. Can't put on packages.config; not Linux/Mono compatible
+  # Install OpenCover. Can't put on `packages.config`, not Mono compatible
   - .\tools\nuget\nuget.exe install OpenCover -OutputDirectory packages
 
 build_script:
 
@@ -0,0 +1,11 @@
+# Requirements for both Travis and AppVeyor
+pytest
+coverage
+
+# Platform specific requirements
+pip; sys_platform == 'win32'
+wheel; sys_platform == 'win32'
+pycparser; sys_platform != 'win32'
+
+# Coverage upload
+codecov
@@ -1,2 +1,6 @@
+# Don't combine `.bumpversion.cfg` with `setup.cfg`. Messes up formatting.
+
 [tool:pytest]
 xfail_strict = True
+# -r fsxX: show extra summary info for: (f)ailed, (s)kip, (x)failed, (X)passed
+addopts = -r fsxX --color=yes