diff --git a/tests/tasks/setup_mock_wifi_wpa3_owe.yml b/tests/tasks/setup_mock_wifi_wpa3_owe.yml
index fac248c..851a416 100644
--- a/tests/tasks/setup_mock_wifi_wpa3_owe.yml
+++ b/tests/tasks/setup_mock_wifi_wpa3_owe.yml
@@ -20,19 +20,14 @@
     # if using rpm ostree - so just skip this test
     - name: >-
         This is an rpm-ostree system. This test cannot be run on such a system.
-        The test wants to install the hostapd package from copr, and install
-        the mac80211_hwsim kernel module. These operations are currently not
-        supported on rpm-ostree systems.
+        The test wants to install the mac80211_hwsim kernel module.
+        These operations are currently not supported on rpm-ostree systems.
       meta: end_host
       when: __network_is_ostree | d(false)
 
     # yamllint disable rule:line-length
-    # Even though hostapd can be installed via EPEL, Opportunistic Wireless Encryption
-    # (OWE) has not been enabled by default. To warrant the test support on RHEL(dist-tag),
-    # we setup hostapd copr repo to enable OWE option.
-    - name: Install hostapd and mac80211_hwsim kernel module in CentOS
+    - name: Install hostapd and mac80211_hwsim kernel modules in CentOS
       shell: |
-        dnf -y copr enable liangwen12year/hostapd-owe
         dnf -y install hostapd
         release=$(uname -r)
         tmp="${release/-//}"
@@ -43,21 +38,13 @@
       changed_when: false
       # yamllint enable rule:line-length
 
-- name: Install hostapd in Fedora
+- name: Install hostapd and mac80211_hwsim kernel modules in Fedora
   shell: |
-    dnf -y copr enable liangwen12year/hostapd-owe
     dnf -y install hostapd
-  when:
-    - ansible_facts['distribution'] == 'Fedora'
-  changed_when: false
-
-- name: Install mac80211_hwsim kernel modules in Fedora
-  shell: |
     dnf -y install koji
     koji download-build --arch=$(uname -m) kernel-modules-internal-$(uname -r)
     dnf -y install kernel-modules*.rpm
-  when:
-    - ansible_facts['distribution'] == 'Fedora'
+  when: ansible_facts['distribution'] == 'Fedora'
   changed_when: false
 
 - name: Create hostapd config
diff --git a/tests/tests_wireless_wpa3_owe_nm.yml b/tests/tests_wireless_wpa3_owe_nm.yml
index 88eff9f..5ec274b 100644
--- a/tests/tests_wireless_wpa3_owe_nm.yml
+++ b/tests/tests_wireless_wpa3_owe_nm.yml
@@ -24,7 +24,6 @@
         __network_is_os_family_rhel: "{{ ansible_facts['os_family'] == 'RedHat' }}"
         __is_rh_distro: "{{ __network_is_rh_distro }}"
 
-
 # The test requires or should run with NetworkManager, therefore it cannot run
 # on RHEL/CentOS 6
 # OWE has not been supported by NetworkManager 1.18.8 on RHEL 7(dist-tag). Failed in setting up mock wifi on RHEL 8
@@ -33,4 +32,5 @@
   when:
     - __network_distro_major_version != '6'
     - __network_distro_major_version | int > 7 and __network_is_centos or
-     __network_distro_major_version | int > 32 and __network_is_fedora
+      __network_distro_major_version | int > 7 and __network_is_rhel or
+      __network_distro_major_version | int > 32 and __network_is_fedora