diff --git a/tcp_tests/managers/envmanager_devops.py b/tcp_tests/managers/envmanager_devops.py
index 958e7f1..c800cc2 100644
--- a/tcp_tests/managers/envmanager_devops.py
+++ b/tcp_tests/managers/envmanager_devops.py
@@ -167,7 +167,7 @@
             config_ssh.append(ssh_data)
         return config_ssh
 
-    def create_snapshot(self, name, description=None):
+    def create_snapshot(self, name, description=None, force=False):
         """Create named snapshot of current env.
 
         - Create a libvirt snapshots for all nodes in the environment
@@ -175,6 +175,11 @@
 
         :name: string
         """
+        if not settings.MAKE_SNAPSHOT_STAGES and not force:
+            msg = ("[ SKIP snapshot '{0}' because MAKE_SNAPSHOT_STAGES=false ]"
+                   " {1}".format(name, description or ''))
+            LOG.info("\n\n{0}\n{1}".format(msg, '*' * len(msg)))
+            return
         msg = "[ Create snapshot '{0}' ] {1}".format(name, description or '')
         LOG.info("\n\n{0}\n{1}".format(msg, '*' * len(msg)))
 
@@ -233,6 +238,11 @@
 
         :param name: string
         """
+        if not settings.MAKE_SNAPSHOT_STAGES:
+            LOG.info("SKIP reverting from snapshot '{0}' "
+                     "because MAKE_SNAPSHOT_STAGES=false".format(name))
+            return
+
         LOG.info("Reverting from snapshot named '{0}'".format(name))
         if self.__env is not None:
             self.__env.revert(name=name)
diff --git a/tcp_tests/managers/envmanager_empty.py b/tcp_tests/managers/envmanager_empty.py
index b9ab8e1..b543c87 100644
--- a/tcp_tests/managers/envmanager_empty.py
+++ b/tcp_tests/managers/envmanager_empty.py
@@ -54,7 +54,7 @@
         raise Exception("EnvironmentManagerEmpty doesn't have SSH details. "
                         "Please provide SSH details in config.underlay.ssh")
 
-    def create_snapshot(self, name, description=None):
+    def create_snapshot(self, name, **kwargs):
         """Store environmetn state into the config object
 
         - Store the state of the environment <name> to the 'config' object