diff --git a/test/gui/suite.conf b/test/gui/suite.conf
index ec535920c18..5b8da565965 100644
--- a/test/gui/suite.conf
+++ b/test/gui/suite.conf
@@ -4,6 +4,6 @@ HOOK_SUB_PROCESSES=false
 IMPLICITAUTSTART=0
 LANGUAGE=Python
 OBJECTMAPSTYLE=script
-TEST_CASES=tst_addAccount tst_sharing tst_syncing tst_loginLogout tst_removeAccountConnection tst_checkAlltabs tst_vfs tst_deletFilesFolders
+TEST_CASES=tst_addAccount tst_sharing tst_syncing tst_loginLogout tst_removeAccountConnection tst_checkAlltabs tst_vfs tst_deletFilesFolders tst_editFiles
 VERSION=3
 WRAPPERS=Qt
diff --git a/test/gui/tst_editFiles/test.feature b/test/gui/tst_editFiles/test.feature
new file mode 100644
index 00000000000..7aa930e1639
--- /dev/null
+++ b/test/gui/tst_editFiles/test.feature
@@ -0,0 +1,22 @@
+Feature: edit files
+
+    As a user
+    I want to be able to edit the file content
+    So that I can modify and change file data
+
+
+    Background:
+        Given user "Alice" has been created on the server with default attributes and without skeleton files
+
+
+    Scenario Outline: Modify orignal content of a file
+        Given user "Alice" has uploaded file with content "ownCloud test text file 0" to "<filename>" on the server
+        And user "Alice" has set up a client with default settings
+        When the user overwrites the file "<filename>" with content "overwrite ownCloud test text file"
+        Then as "Alice" the file "<filename>" on the server should have the content "overwrite ownCloud test text file"
+        Examples:
+            | filename     |
+            | textfile.txt |
+            | textfile.doc |
+            | textfile.xls |
+            | textfile.pdf |
\ No newline at end of file
diff --git a/test/gui/tst_editFiles/test.py b/test/gui/tst_editFiles/test.py
new file mode 100644
index 00000000000..d6224b99e57
--- /dev/null
+++ b/test/gui/tst_editFiles/test.py
@@ -0,0 +1,9 @@
+source(findFile('scripts', 'python/bdd.py'))
+
+setupHooks('../shared/scripts/bdd_hooks.py')
+collectStepDefinitions('./steps', '../shared/steps')
+
+
+def main():
+    testSettings.throwOnFailure = True
+    runFeatureFile('test.feature')