diff --git a/tests/__init__.py b/tests/__init__.py
index e8b9fa2..2005eed 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,5 @@
 import os
 
 # Setup test environment variables
-os.environ["ENVIRON"] = "test"
+if os.environ.get("ENVIRON") is None:
+    os.environ["ENVIRON"] = "test"
diff --git a/tests/general/test_env.py b/tests/general/test_env.py
new file mode 100644
index 0000000..ea89775
--- /dev/null
+++ b/tests/general/test_env.py
@@ -0,0 +1,28 @@
+from os import environ
+from warnings import warn
+
+# Tests environment variables used within the projects domain are
+# set in the correct environment
+
+VARS = ['ENVIRON', 'APPSECRET', 'FILESTORE']
+
+
+def test_env_vars():
+    """ Test that required environment variables are set
+        ahead of runtime
+    """
+    for var in VARS:
+        env = environ.get(var)
+
+        # Check to see what variable we are comparing
+        if env is None:
+            warn(f"Variable {var} is not set!")
+
+
+def test_environment_var_state():
+    """ Tests that the 'ENVIRON' Environment variable
+        is in a correct state
+    """
+    var = environ.get('ENVIRON')
+    assert var is not None
+    assert (var == "test" or var == "prod")