diff --git a/atomic-reactor-fix-multiarch-test.patch b/atomic-reactor-fix-multiarch-test.patch
deleted file mode 100644
index d1cd519..0000000
--- a/atomic-reactor-fix-multiarch-test.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ae8d611b51c1046ad0aa2a8b523e0d1391916d94 Mon Sep 17 00:00:00 2001
-From: Clement Verna <cverna@tutanota.com>
-Date: Thu, 1 Feb 2018 10:15:16 +0100
-Subject: [PATCH 1/1] Add multi arch support for failing test
-
-Signed-off-by: Clement Verna <cverna@tutanota.com>
----
- tests/plugins/test_koji_upload.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/plugins/test_koji_upload.py b/tests/plugins/test_koji_upload.py
-index 8142aac..4bd221a 100644
---- a/tests/plugins/test_koji_upload.py
-+++ b/tests/plugins/test_koji_upload.py
-@@ -924,7 +924,7 @@ class TestKojiUpload(object):
-                                             prefer_schema1_digest=prefer_schema1_digest,
-                                             )
-         runner = create_runner(tasker, workflow, blocksize=blocksize, target=target,
--                               prefer_schema1_digest=prefer_schema1_digest)
-+                               prefer_schema1_digest=prefer_schema1_digest, platform=LOCAL_ARCH)
-         runner.run()
- 
-         data = get_metadata(workflow, osbs)
--- 
-2.14.3
-
diff --git a/atomic-reactor.spec b/atomic-reactor.spec
index 4282a12..097da7b 100644
--- a/atomic-reactor.spec
+++ b/atomic-reactor.spec
@@ -17,7 +17,8 @@
 %global binaries_py_version %{python2_version}
 %endif
 
-%if 0%{?fedora}
+%if (0%{?fedora} < 28)
+# tests are failing in f28 with new version of pytest
 # rhel/epel has no flexmock, pytest-capturelog
 %global with_check 1
 %endif
@@ -25,14 +26,14 @@
 %global owner projectatomic
 %global project atomic-reactor
 
-%global commit a50125cdfc0d90e1d06922f86c574b6895b3ad08 
+%global commit ea00058e3a69031f46eb47115e8f201ff95e77e9
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %global dock_obsolete_vr 1.3.7-2
 
 Name:           %{project}
-Version:        1.6.29
-Release:        3%{?dist}
+Version:        1.6.31
+Release:        1%{?dist}
 
 Summary:        Improved builder for Docker images
 Group:          Development/Tools
@@ -46,13 +47,6 @@ Source0:        https://github.com/%{owner}/%{project}/archive/%{commit}/%{proje
 # upstream (at the time of this writing). Switching to the 2.x release
 Patch0:         atomic-reactor-fix-docker-py-requires.patch
 
-# Need to fix the unit test for non x86_64 arch
-#
-# Submitted upstream
-#
-# https://github.com/projectatomic/atomic-reactor/pull/906
-Patch1:         atomic-reactor-fix-multiarch-test.patch
-
 BuildArch:      noarch
 
 %if 0%{?with_check}
@@ -242,7 +236,6 @@ Plugins for automated rebuilds
 %setup -qn %{name}-%{commit}
 
 %patch0 -p0
-%patch1 -p1
 
 %build
 %py2_build
@@ -428,6 +421,9 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests
 
 
 %changelog
+* Tue May 15 2018 Clement Verna <cverna@fedoraproject.org> - 1.6.31-1
+- Update to latest upstream
+
 * Mon Feb 19 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.6.29-3
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)