diff --git a/SOURCES/openscap-1.3.5-test-non-local-gpfs-PR_1653.patch b/SOURCES/openscap-1.3.5-test-non-local-gpfs-PR_1653.patch
new file mode 100644
index 0000000..7b2a2c2
--- /dev/null
+++ b/SOURCES/openscap-1.3.5-test-non-local-gpfs-PR_1653.patch
@@ -0,0 +1,9 @@
+diff --git a/tests/API/probes/fake_mtab b/tests/API/probes/fake_mtab
+index 94b1fe295..32c516b7d 100644
+--- a/tests/API/probes/fake_mtab
++++ b/tests/API/probes/fake_mtab
+@@ -5,3 +5,4 @@ tmpfs /tmp tmpfs rw,seclabel,nosuid,nodev 0 0
+ /dev/mapper/fedora-home /home ext4 rw,seclabel,relatime 0 0
+ proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
+ //192.168.0.5/storage /media/movies cifs guest,uid=myuser,iocharset=utf8,file_mode=0777,dir_mode=0777,noperm 0 0
++/dev/gpfsdev /gpfs gpfs rw,relatime 0 0
diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec
index 07e9f28..479007b 100644
--- a/SPECS/openscap.spec
+++ b/SPECS/openscap.spec
@@ -1,6 +1,6 @@
 Name:           openscap
 Version:        1.3.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -12,6 +12,7 @@ Patch3:         openscap-1.3.5-coverity2-PR_1620.patch
 Patch4:         openscap-1.3.5-yamlfilecontent-fix-field-names-PR_1619.patch
 Patch5:         openscap-1.3.5-memory-PR_1627.patch
 Patch6:         openscap-1.3.5-use-MALLOC_CHECK-in-tests-PR_1635.patch
+Patch7:         openscap-1.3.5-test-non-local-gpfs-PR_1653.patch
 BuildRequires:  cmake >= 2.6
 BuildRequires:  swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser
 BuildRequires:  rpm-devel
@@ -218,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/oscap-run-sce-script
 
 %changelog
+* Wed Nov 25 2020 Evgenii Kolesnikov <ekolesni@redhat.com> - 1.3.4-5
+- Add check for non-local GPFS file system into Test Suite (RHBZ#1840578)
+
 * Fri Nov 13 2020 Evgenii Kolesnikov <ekolesni@redhat.com> - 1.3.4-4
 - Use MALLOC_CHECK_=3 while executing Test Suite (RHBZ#1891770)