diff --git a/avocado-66.0-skip-unreliable-selftests.patch b/avocado-66.0-skip-unreliable-selftests.patch
index 6e45bcb..e01b4a5 100644
--- a/avocado-66.0-skip-unreliable-selftests.patch
+++ b/avocado-66.0-skip-unreliable-selftests.patch
@@ -22,7 +22,7 @@ diff -ru ../avocado-66.0.ORIG/selftests/unit/test_utils_iso9660.py ./selftests/u
          super(PyCDLib, self).setUp()
 diff -ru ../avocado-66.0.ORIG/selftests/unit/test_utils_vmimage.py ./selftests/unit/test_utils_vmimage.py
 --- ../avocado-66.0.ORIG/selftests/unit/test_utils_vmimage.py	2018-11-19 21:24:10.000000000 -0600
-+++ ./selftests/unit/test_utils_vmimage.py	2018-11-21 09:52:03.889455464 -0600
++++ ./selftests/unit/test_utils_vmimage.py	2018-11-21 14:19:44.915818674 -0600
 @@ -138,6 +138,7 @@
          self.assertEqual(suse_provider.get_best_version(self.suse_available_versions),
                           suse_latest_version)
@@ -31,3 +31,11 @@ diff -ru ../avocado-66.0.ORIG/selftests/unit/test_utils_vmimage.py ./selftests/u
      @mock.patch('avocado.utils.vmimage.urlopen')
      def test_get_image_url(self, urlopen_mock):
          image = 'openSUSE-Leap-15.0-OpenStack.x86_64-0.0.4-Buildlp150.12.30.qcow2'
+@@ -150,6 +151,7 @@
+         suse_provider.get_version = mock.Mock(return_value='15.0')
+         self.assertEqual(suse_provider.get_image_url(), expected_image_url)
+ 
++    @unittest.skip("Test currently unreliable resulting in Fedora build failures")
+     @mock.patch('avocado.utils.vmimage.urlopen')
+     def test_get_image_url_defining_build(self, urlopen_mock):
+         image = 'openSUSE-Leap-15.0-OpenStack.x86_64-1.1.1-Buildlp111.11.11.qcow2'
diff --git a/python-avocado.spec b/python-avocado.spec
index be6873a..1475bf3 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -91,13 +91,17 @@ BuildRequires: fabric
 %if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: python2-enum34
 BuildRequires: python2-lxml
-BuildRequires: python2-pycdlib
 BuildRequires: python2-stevedore
 %else
 BuildRequires: python-enum34
 BuildRequires: python-lxml
 BuildRequires: python-stevedore
 %endif
+%if 0%{?fedora} && 0%{?fedora} <= 29
+# Python2 binary packages are being removed
+# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+BuildRequires: python2-pycdlib
+%endif
 %endif
 
 %if %{with python3}
@@ -538,12 +542,16 @@ Requires: python2-setuptools
 Requires: python2-six
 %if 0%{?fedora} || 0%{?rhel} > 7
 Requires: python2-enum34
-Requires: python2-pycdlib
 Requires: python2-stevedore
 %else
 Requires: python-enum34
 Requires: python-stevedore
 %endif
+%if 0%{?fedora} && 0%{?fedora} <= 29
+# Python2 binary packages are being removed
+# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+Requires: python2-pycdlib
+%endif
 
 %description -n python2-%{pkgname}
 Avocado is a set of tools and libraries (what people call
@@ -1090,6 +1098,8 @@ Again Shell code (and possibly other similar shells).
 %changelog
 * Wed Nov 21 2018 Merlin Mathesius <mmathesi@redhat.com> - 66.0-1
 - Sync with upstream release 66.0.
+- python2-pycdlib package has been removed in F30 as part of
+  https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
 
 * Thu Oct 04 2018 Merlin Mathesius <mmathesi@redhat.com> - 65.0-1
 - Sync with upstream release 65.0.