diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index f9e2d0c3..e9af4301 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -1,14 +1,14 @@
 trigger:
 - 'master'
-- '*-maintenance'
+- '*.x'
 
 jobs:
 - job: Flask
   variables:
     vmImage: ubuntu-latest
     python.version: '3.7'
-    TOXENV: 'py,codecov'
     python.architecture: 'x64'
+    TOXENV: 'py,codecov'
     publish.test.results: 'true'
 
   strategy:
@@ -33,10 +33,10 @@ jobs:
         python.version: '2.7'
         vmImage: 'windows-latest'
       DocsHtml:
-        TOXENV: docs-html
+        TOXENV: 'docs-html'
         publish.test.results: 'false'
       VersionRange:
-        TOXENV: devel,lowest,codecov
+        TOXENV: 'devel,lowest,codecov'
 
   pool:
     vmImage: $[ variables.vmImage ]
@@ -46,6 +46,7 @@ jobs:
     inputs:
       versionSpec: $(python.version)
       architecture: $(python.architecture)
+    displayName: 'Use Python $(python.version)'
 
   - script: pip install -U tox
     displayName: 'Install tox'
@@ -58,22 +59,24 @@ jobs:
       testResultsFiles: 'test-results.xml'
       testRunTitle: '$(Agent.JobName)'
     condition: eq(variables['publish.test.results'], 'true')
-  
+    displayName: 'Publish test results'
+
   # TODO: add codecov token
 
 # As a courtesy, try this on the dev version of Python
 # Use a container since Azure Pipelines may not have the bleeding-edge Python RC
 - job: FlaskOnLatest
-  pool: { vmImage: ubuntu-latest }
+  pool:
+    vmImage: ubuntu-latest
+  container: python:rc-stretch
   variables:
     TOXENV: 'future'
-  container: python:rc-stretch
   steps:
   - script: |
       echo "##vso[task.prependPath]$HOME/.local/bin"
       pip install -U --user tox
     displayName: 'Install tox'
-  
+
   # don't fail the build if this doesn't work!
   - script: tox
     displayName: 'Run tox'
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index bbed06fc..fd9734c8 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -10,8 +10,10 @@ Please, don't use the issue tracker for this. Use one of the following
 resources for questions about your own code:
 
 * The ``#get-help`` channel on our Discord chat: https://discord.gg/t6rrQZH
+
   * The IRC channel ``#pocoo`` on FreeNode is linked to Discord, but
     Discord is preferred.
+
 * The mailing list flask@python.org for long term discussion or larger issues.
 * Ask on `Stack Overflow`_. Search with Google first using:
   ``site:stackoverflow.com flask {search term, exception message, etc.}``
diff --git a/tox.ini b/tox.ini
index 2afa66d0..5110c152 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,16 +35,15 @@ commands =
     pip install -q -e examples/javascript[test]
 
     # pytest-cov doesn't seem to play nice with -p
-    coverage run -p -m pytest --junitxml=test-results.xml tests examples
+    coverage run -p -m pytest --tb=short --junitxml=test-results.xml {posargs:tests examples}
 
 [testenv:future]
+# courtesy Python nightly test, don't fail the build in CI
 ignore_outcome = true
-
 commands =
     pip install -q -e examples/tutorial[test]
     pip install -q -e examples/javascript[test]
-
-    coverage run -p -m pytest tests examples
+    coverage run -p -m pytest --tb=short --junitxml=test-results.xml {posargs:tests examples}
 
 [testenv:stylecheck]
 deps = pre-commit