diff --git a/zaza/model.py b/zaza/model.py
index dccfb3b..9448075 100644
--- a/zaza/model.py
+++ b/zaza/model.py
@@ -51,8 +51,11 @@ def get_juju_model():
         # Check the environment
         CURRENT_MODEL = os.environ["JUJU_MODEL"]
     except KeyError:
-        # If unset connect get the current active model
-        CURRENT_MODEL = get_current_model()
+        try:
+            CURRENT_MODEL = os.environ["MODEL_NAME"]:
+        except KeyError:
+            # If unset connect get the current active model
+            CURRENT_MODEL = get_current_model()
     return CURRENT_MODEL