diff -Nurp pdir2-0.3.1.orig/tests/test_z_config.py pdir2-0.3.1/tests/test_z_config.py
--- pdir2-0.3.1.orig/tests/test_z_config.py	2018-10-25 09:42:55.000000000 -0500
+++ pdir2-0.3.1/tests/test_z_config.py	2020-01-02 11:32:44.039579022 -0600
@@ -15,10 +15,10 @@ from sys import modules
 import pytest
 from pdir.color import COLORS
 
-if pytest.__version__[0] == '2':
-    from pytest import yield_fixture as fixture
-elif pytest.__version__[0] == '3':
+if int(pytest.__version__.split('.')[0]) >= 3:
     from pytest import fixture as fixture
+else:
+    from pytest import yield_fixture as fixture
 
 
 @fixture
@@ -54,7 +54,7 @@ def test_default_env_without_config(clea
 
 def test_set_env_without_config(clean):
     os.environ['PDIR2_CONFIG_FILE'] = 'aaa'
-    with pytest.raises(OSError, message='Config file not exist: aaa'):
+    with pytest.raises(OSError, match='Config file not exist: aaa'):
         import pdir
 
         pdir()
@@ -104,7 +104,7 @@ def test_empty_config(clean):
 
 def test_invalid_config_1(clean):
     shutil.copyfile('tests/data/error_config_1.ini', clean)
-    with pytest.raises(ValueError, message='Invalid key: doc-color1'):
+    with pytest.raises(ValueError, match='Invalid key: doc-color1'):
         import pdir
 
         pdir()
@@ -112,7 +112,7 @@ def test_invalid_config_1(clean):
 
 def test_invalid_config_2(clean):
     shutil.copyfile('tests/data/error_config_2.ini', clean)
-    with pytest.raises(ValueError, message='Invalid color value: 42'):
+    with pytest.raises(ValueError, match='Invalid color value: 42'):
         import pdir
 
         pdir()