diff --git a/src/_pytest/warnings.py b/src/_pytest/warnings.py
index abd04801b..f2f23a6e2 100644
--- a/src/_pytest/warnings.py
+++ b/src/_pytest/warnings.py
@@ -49,6 +49,14 @@ def pytest_addoption(parser):
     )
 
 
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers",
+        "filterwarnings(warning): add a warning filter to the given test. "
+        "see http://pytest.org/latest/warnings.html#pytest-mark-filterwarnings ",
+    )
+
+
 @contextmanager
 def catch_warnings_for_item(item):
     """
diff --git a/testing/test_warnings.py b/testing/test_warnings.py
index 15ec36600..99a5aff47 100644
--- a/testing/test_warnings.py
+++ b/testing/test_warnings.py
@@ -287,3 +287,18 @@ def test_non_string_warning_argument(testdir):
     )
     result = testdir.runpytest("-W", "always")
     result.stdout.fnmatch_lines(["*= 1 passed, 1 warnings in *"])
+
+
+def test_filterwarnings_mark_registration(testdir):
+    """Ensure filterwarnings mark is registered"""
+    testdir.makepyfile(
+        """
+        import pytest
+
+        @pytest.mark.filterwarnings('error')
+        def test_error():
+            assert True
+    """
+    )
+    result = testdir.runpytest("--strict")
+    assert result.ret == 0