diff --git a/var/spack/repos/builtin/packages/unifyfs/package.py b/var/spack/repos/builtin/packages/unifyfs/package.py
index 77b40147412..a2290bfa670 100644
--- a/var/spack/repos/builtin/packages/unifyfs/package.py
+++ b/var/spack/repos/builtin/packages/unifyfs/package.py
@@ -36,9 +36,8 @@ class Unifyfs(AutotoolsPackage):
 
     # Required dependencies
     depends_on('flatcc')
-    # Latest version of GOTCHA has API changes that break UnifyFS.
-    # Updates to UnifyFS are coming in order to fix this.
-    depends_on('gotcha@0.0.2')
+    depends_on('gotcha@0.0.2', when='@:0.9.0')
+    depends_on('gotcha@1.0.3:', when='@0.9.1:')
     depends_on('leveldb')
     depends_on('margo')
     depends_on('mercury+bmi+sm')