diff --git a/mistralclient/tests/functional/cli/v2/cli_tests_v2.py b/mistralclient/tests/functional/cli/v2/cli_tests_v2.py
index 061a58c..e2ab2b7 100644
--- a/mistralclient/tests/functional/cli/v2/cli_tests_v2.py
+++ b/mistralclient/tests/functional/cli/v2/cli_tests_v2.py
@@ -1118,6 +1118,12 @@ class NegativeCLITests(base_v2.MistralClientTestBase):
                           self.mistral_admin,
                           'environment-get')
 
+    def test_env_get_nonexistent(self):
+        self.assertRaises(exceptions.CommandFailed,
+                          self.mistral_admin,
+                          'environment-get',
+                          params='nonexist')
+
     def test_env_create_same_name(self):
         self.create_file('env.yaml',
                          'name: env\n'
@@ -1130,6 +1136,12 @@ class NegativeCLITests(base_v2.MistralClientTestBase):
                           self.environment_create,
                           'env.yaml')
 
+    def test_env_create_empty(self):
+        self.create_file('env.yaml')
+        self.assertRaises(exceptions.CommandFailed,
+                          self.environment_create,
+                          'env.yaml')
+
     def test_env_create_with_wrong_path_to_definition(self):
         self.assertRaises(exceptions.CommandFailed,
                           self.mistral_admin,
@@ -1148,6 +1160,13 @@ class NegativeCLITests(base_v2.MistralClientTestBase):
                           'environment-update',
                           params='env')
 
+    def test_env_update_empty(self):
+        self.create_file('env.yaml')
+        self.assertRaises(exceptions.CommandFailed,
+                          self.mistral_admin,
+                          'environment-update',
+                          params='env')
+
     def test_env_update_nonexistant_env(self):
         self.create_file('env.yaml',
                          'name: env'