diff --git a/doc/whats-new.rst b/doc/whats-new.rst
index 1dc6e0cee1b..e62c7e87d44 100644
--- a/doc/whats-new.rst
+++ b/doc/whats-new.rst
@@ -83,6 +83,9 @@ Bug fixes
 - Replace incorrect usages of `message` in pytest assertions 
   with `match` (:issue:`3011`)
   By `Maximilian Roos <https://github.com/max-sixty>`_.
+- Add explicit pytest markers, now required by pytest
+  (:issue:`3032`).
+  By `Maximilian Roos <https://github.com/max-sixty>`_.
 
 .. _whats-new.0.12.1:
 
diff --git a/setup.cfg b/setup.cfg
index 51449138780..28cf17b92d0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,10 @@ ignore=
     F401
 exclude=
     doc
+markers =
+    flaky: flaky tests
+    network: tests requiring a network connection
+    slow: slow tests
 
 [isort]
 default_section=THIRDPARTY
diff --git a/xarray/tests/test_dataset.py b/xarray/tests/test_dataset.py
index 98e488552d1..812e2893db5 100644
--- a/xarray/tests/test_dataset.py
+++ b/xarray/tests/test_dataset.py
@@ -4625,7 +4625,7 @@ def test_error_message_on_set_supplied():
 def test_constructor_raises_with_invalid_coords(unaligned_coords):
 
     with pytest.raises(ValueError,
-                       message='not a subset of the DataArray dimensions'):
+                       match='not a subset of the DataArray dimensions'):
         xr.DataArray([1, 2, 3], dims=['x'], coords=unaligned_coords)