diff --git a/test/gui/shared/scripts/names.py b/test/gui/shared/scripts/names.py
index 34e9f78c45f..783b35dbe17 100644
--- a/test/gui/shared/scripts/names.py
+++ b/test/gui/shared/scripts/names.py
@@ -100,3 +100,5 @@
 settings_settingsdialog_toolbutton_Activity_QToolButton = {"name": "settingsdialog_toolbutton_Activity", "type": "QToolButton", "visible": 1, "window": settings_OCC_SettingsDialog}
 sharingDialog_Close_QPushButton = {"text": "Close", "type": "QPushButton", "unnamed": 1, "visible": 1, "window": sharingDialog_OCC_ShareDialog}
 stack_Enable_experimental_placeholder_mode_QPushButton = {"container": settings_stack_QStackedWidget, "text": "Enable experimental placeholder mode", "type": "QPushButton", "unnamed": 1, "visible": 1}
+disable_virtual_file_support_QMessageBox = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Disable virtual file support?"}
+disable_virtual_file_support_Disable_support_QPushButton = {"text": "Disable support", "type": "QPushButton", "unnamed": 1, "visible": 1, "window": disable_virtual_file_support_QMessageBox}
diff --git a/test/gui/shared/steps/steps.py b/test/gui/shared/steps/steps.py
index de1d7cc46a8..63ac4923ba7 100644
--- a/test/gui/shared/steps/steps.py
+++ b/test/gui/shared/steps/steps.py
@@ -728,11 +728,64 @@ def step(context, resource, group):
 
 @When("the user enables virtual file support")
 def step(context):
-    mouseClick(waitForObjectItem(names.stack_folderList_QTreeView, "_1"), 718, 27, Qt.NoModifier, Qt.LeftButton)
-    activateItem(waitForObjectItem(names.settings_QMenu, "Enable virtual file support (experimental)..."))
-    clickButton(waitForObject(names.stack_Enable_experimental_placeholder_mode_QPushButton))
+    mouseClick(
+        waitForObjectItem(names.stack_folderList_QTreeView, "_1"),
+        718,
+        27,
+        Qt.NoModifier,
+        Qt.LeftButton,
+    )
+    activateItem(
+        waitForObjectItem(
+            names.settings_QMenu, "Enable virtual file support (experimental)..."
+        )
+    )
+    clickButton(
+        waitForObject(names.stack_Enable_experimental_placeholder_mode_QPushButton)
+    )
 
 
 @Then("the virtual file support should be enabled")
 def step(context):
     pass
+
+
+@Given("the user has enabled virtual file support")
+def step(context):
+    mouseClick(
+        waitForObjectItem(names.stack_folderList_QTreeView, "_1"),
+        715,
+        31,
+        Qt.NoModifier,
+        Qt.LeftButton,
+    )
+    activateItem(
+        waitForObjectItem(
+            names.settings_QMenu, "Enable virtual file support (experimental)..."
+        )
+    )
+    clickButton(
+        waitForObject(names.stack_Enable_experimental_placeholder_mode_QPushButton)
+    )
+
+
+@When("the user diables virtual file support")
+def step(context):
+    mouseClick(
+        waitForObjectItem(names.stack_folderList_QTreeView, "_1"),
+        720,
+        33,
+        Qt.NoModifier,
+        Qt.LeftButton,
+    )
+    activateItem(
+        waitForObjectItem(names.settings_QMenu, "Disable virtual file support...")
+    )
+    clickButton(
+        waitForObject(names.disable_virtual_file_support_Disable_support_QPushButton)
+    )
+
+
+@Then("the virtual file support should be disbaleds")
+def step(context):
+    pass
diff --git a/test/gui/tst_vfs/test.feature b/test/gui/tst_vfs/test.feature
index 32cd65510a8..88f427c7d00 100644
--- a/test/gui/tst_vfs/test.feature
+++ b/test/gui/tst_vfs/test.feature
@@ -9,4 +9,12 @@ Feature: Enable/disable virtual file support
         Given user "Alice" has been created on the server with default attributes and without skeleton files
         And user "Alice" has set up a client with default settings
         When the user enables virtual file support
-        Then the virtual file support should be enabled
\ No newline at end of file
+        Then the virtual file support should be enabled
+
+
+    Scenario: Disable VFS
+        Given user "Alice" has been created on the server with default attributes and without skeleton files
+        And user "Alice" has set up a client with default settings
+        And the user has enabled virtual file support
+        When the user diables virtual file support
+        Then the virtual file support should be disbaleds
\ No newline at end of file
diff --git a/test/gui/tst_vfs/test.py b/test/gui/tst_vfs/test.py
index 75e47d0b334..d6224b99e57 100644
--- a/test/gui/tst_vfs/test.py
+++ b/test/gui/tst_vfs/test.py
@@ -3,6 +3,7 @@
 setupHooks('../shared/scripts/bdd_hooks.py')
 collectStepDefinitions('./steps', '../shared/steps')
 
+
 def main():
     testSettings.throwOnFailure = True
     runFeatureFile('test.feature')