--- pyproj-3.0.1.unchanged/test/conftest.py	2021-03-03 02:11:53.000000000 +0100
+++ pyproj-3.0.1/test/conftest.py	2021-05-10 19:42:42.136898480 +0200
@@ -7,8 +7,8 @@ import pyproj
 from pyproj.datadir import get_data_dir, get_user_data_dir, set_data_dir
 
 _NETWORK_ENABLED = pyproj.network.is_network_enabled()
-PROJ_GTE_8 = LooseVersion(pyproj.__proj_version__) >= LooseVersion("8.0")
-
+PROJ_LOOSE_VERSION = LooseVersion(pyproj.__proj_version__)
+PROJ_GTE_8 = PROJ_LOOSE_VERSION >= LooseVersion("8.0")
 
 if PROJ_GTE_8:
     # https://github.com/OSGeo/PROJ/pull/2536
--- pyproj-3.0.1.unchanged/test/crs/test_crs_cf.py	2021-03-05 04:14:46.000000000 +0100
+++ pyproj-3.0.1/test/crs/test_crs_cf.py	2021-05-10 19:46:05.924005046 +0200
@@ -1,3 +1,5 @@
+from distutils.version import LooseVersion
+
 import numpy
 import pytest
 from numpy.testing import assert_almost_equal
@@ -17,8 +19,11 @@ from pyproj.crs.coordinate_operation imp
     VerticalPerspectiveConversion,
 )
 from pyproj.exceptions import CRSError
-from test.conftest import HAYFORD_ELLIPSOID_NAME, get_wgs84_datum_name
-
+from test.conftest import (
+    HAYFORD_ELLIPSOID_NAME,
+    PROJ_LOOSE_VERSION,
+    get_wgs84_datum_name,
+)
 
 def _to_dict(operation):
     param_dict = {}
@@ -865,6 +870,12 @@ def test_osgb_1936():
             "Scale factor at natural origin"
         ],
     }
+    if PROJ_LOOSE_VERSION >= LooseVersion("8.0.1"):
+        expected_cf.update(
+            geographic_crs_name="OSGB36",
+            horizontal_datum_name="Ordnance Survey of Great Britain 1936",
+            projected_crs_name="OSGB36 / British National Grid",
+        )
     cf_dict = crs.to_cf()
     assert cf_dict.pop("crs_wkt").startswith("PROJCRS[")
     assert cf_dict == expected_cf