diff --git a/conda-tests.patch b/conda-tests.patch
deleted file mode 100644
index 4490454..0000000
--- a/conda-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/test_link_order.py b/tests/test_link_order.py
-index 7021065..55b7de0 100644
---- a/tests/test_link_order.py
-+++ b/tests/test_link_order.py
-@@ -10,8 +10,6 @@ import tempfile
- 
- from .test_create import run_command, Commands
- 
--from conda_build import api
--
- try:
-     from unittest.mock import patch
- except ImportError:
diff --git a/conda.spec b/conda.spec
index 443436a..aee8fdd 100644
--- a/conda.spec
+++ b/conda.spec
@@ -2,7 +2,7 @@
 %global with_python2 0%{?fedora} && 0%{?fedora} < 30
 
 Name:           conda
-Version:        4.6.13
+Version:        4.7.1
 Release:        1%{?dist}
 Summary:        Cross-platform, Python-agnostic binary package manager
 
@@ -18,7 +18,6 @@ Source0:        https://github.com/conda/conda/archive/%{version}/%{name}-%{vers
 Patch0:         conda_sys_prefix.patch
 Patch1:         conda_gateways_disk_create.patch
 Patch2:         setup.patch
-Patch3:         conda-tests.patch
 
 Patch10001:     0001-Fix-toolz-imports.patch
 Patch10002:     0002-Adjust-ruamel.yaml-imports.patch
@@ -80,6 +79,7 @@ BuildRequires:  python2-requests
 BuildRequires:  python2-cytoolz
 %endif
 # For tests
+BuildRequires:  python2-conda-package-handling
 BuildRequires:  python2-enum34
 BuildRequires:  python2-futures
 BuildRequires:  python2-pytest-cov
@@ -89,6 +89,7 @@ BuildRequires:  python2-pytest-cov
 # Having both is still useful because the automatic ones have
 # version requirements.
 Requires:       %py2_reqs
+Requires:       python2-conda-package-handling
 Requires:       python2-enum34
 Requires:       python2-futures
 %if 0%{?fedora}
@@ -115,9 +116,11 @@ BuildRequires:  python%{python3_pkgversion}-yaml
 BuildRequires:  python%{python3_pkgversion}-cytoolz >= 0.8.2
 %endif
 # For tests
+BuildRequires:  python%{python3_pkgversion}-conda-package-handling
 BuildRequires:  python%{python3_pkgversion}-pytest-cov
 
 Requires:       %py3_reqs
+Requires:       python%{python3_pkgversion}-conda-package-handling
 Requires:       python%{python3_pkgversion}-requests
 Requires:       python%{python3_pkgversion}-yaml
 %if 0%{?fedora}
@@ -238,6 +241,9 @@ py.test-%{python2_version} -vv -m "not integration" -k "not test_unicode"
 
 
 %changelog
+* Sun Jun  9 2019 Orion Poplawski <orion@nwra.com> - 4.7.1-1
+- Update to 4.7.1
+
 * Tue Apr 16 2019 Orion Poplawski <orion@nwra.com> - 4.6.13-1
 - Update to 4.6.13
 
diff --git a/conda_gateways_disk_create.patch b/conda_gateways_disk_create.patch
index 59235e2..713698f 100644
--- a/conda_gateways_disk_create.patch
+++ b/conda_gateways_disk_create.patch
@@ -1,15 +1,16 @@
---- conda-4.6.9/conda/gateways/disk/create.py.orig	2019-03-29 19:33:49.000000000 -0600
-+++ conda-4.6.9/conda/gateways/disk/create.py	2019-03-30 20:40:49.522977470 -0600
-@@ -27,7 +27,7 @@
+diff -up conda-4.7.0/conda/gateways/disk/create.py.orig conda-4.7.0/conda/gateways/disk/create.py
+--- conda-4.7.0/conda/gateways/disk/create.py.orig	2019-05-17 11:08:48.000000000 -0600
++++ conda-4.7.0/conda/gateways/disk/create.py	2019-05-18 19:46:11.428298209 -0600
+@@ -28,7 +28,7 @@ from ...base.context import context
+ from ...common.compat import on_win
  from ...common.path import ensure_pad, expand, win_path_double_escape, win_path_ok
  from ...common.serialize import json_dump
- from ...exceptions import (BasicClobberError, CaseInsensitiveFileSystemError, CondaOSError,
--                           maybe_raise, CondaFileIOError)
-+                           maybe_raise, CondaFileIOError, NotWritableError)
+-from ...exceptions import BasicClobberError, CondaOSError, maybe_raise
++from ...exceptions import BasicClobberError, CondaOSError, maybe_raise, NotWritableError
  from ...models.enums import FileMode, LinkType
  
- log = getLogger(__name__)
-@@ -407,6 +407,9 @@
+ 
+@@ -438,6 +438,9 @@ def create_package_cache_directory(pkgs_
          sudo_safe = expand(pkgs_dir).startswith(expand('~'))
          touch(join(pkgs_dir, PACKAGE_CACHE_MAGIC_FILE), mkdir=True, sudo_safe=sudo_safe)
          touch(join(pkgs_dir, 'urls'), sudo_safe=sudo_safe)
@@ -17,5 +18,5 @@
 +        log.trace("cannot create package cache directory '%s'", pkgs_dir)
 +        return False
      except (IOError, OSError) as e:
-         if e.errno in (EACCES, EPERM):
+         if e.errno in (EACCES, EPERM, EROFS):
              log.trace("cannot create package cache directory '%s'", pkgs_dir)
diff --git a/sources b/sources
index d7e13c0..cd32abb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conda-4.6.13.tar.gz) = 8f0ad3cac26e88740ffc94f980546827388151746d8fad133b131dc893d8bb4a2840fb4f08e6c98759b1d919e8d24b05c93acd76bfc16ae5d487f699ea5ce20d
+SHA512 (conda-4.7.1.tar.gz) = 0ecd1352ef652825922392a66d8aaf023e76096ad49bfad3de29b12e8a5503fcc46453e78fa9ba0f900c65596cf40f1b58d496bb8c353fe27ca2384910374c6b