diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
new file mode 100644
index 00000000000..5cd6547e687
--- /dev/null
+++ b/addons/document/test/document_test2.yml
@@ -0,0 +1,24 @@
+- 
+    In order to test the document management
+-
+    I make sure the default installation has some storage and root directory.
+-
+    I create a "Testing" folder where all the test data will go.
+-
+    I create an attachment into the root folder (w. empty fields, test that
+    defaults work)
+-
+    I delete the attachment from the root folder
+-
+    I create an attachment into the Testing folder.
+-
+    I update the attachment with data, namely "abcd"
+-
+    I rename the attachment.
+-
+    I search the testing folder for attachments.
+-
+    I create an attachment to a 3rd resource, eg. a res.country
+-
+    I search for the res.country attachment
+-
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
new file mode 100644
index 00000000000..4f77fdbb723
--- /dev/null
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -0,0 +1,62 @@
+-
+    In order to test the document_ftp functionality
+-
+    I open the 8021 port and see for ftp presence there
+-
+    I read the list of databases at port 8021 and confirm our db is
+    there
+-
+    I try to locate the default "Documents" folder in the db.
+-
+    I create a "test.txt" file at the server (directly). The file
+    should have the "abcd" content
+-
+    I look for the "test.txt" file at the server
+-
+    I check that the content of "test.txt" is "abcd"
+-
+    I try to cd into an non-existing folder 'Not-This'
+-
+    I create a "test2.txt" file through FTP.
+-
+    I look for the "test2.txt" file at the server
+-
+    I look for the "test2.txt" file through FTP.
+-
+    I delete the "test2.txt" file using FTP.
+-
+    I check at the server that test2.txt is deleted
+-
+    I create a test2.txt file again.
+-
+    I delete the test2.txt from the server (RPC).
+-
+    I check through FTP that test2.txt does not appear.
+-
+    I create a "test-name.txt" file
+-
+    I rename the "test-name.txt" file through ftp.
+-
+    I check that test-name.txt has been renamed.
+-
+    I create a new folder 'Test-Folder2' through FTP
+-
+    I create a file 'test3.txt' at the 'Test-Folder2'
+-
+    I try to retrieve test3.txt
+-
+    I create a new folder, 'Test-Folder3', through FTP
+    I try to move test3.txt to 'Test-Folder3'
+-
+    I remove the 'Test-Folder3'
+-
+    I check that test3.txt is removed.
+-
+    I create 1000 files through FTP
+-
+    I list the 1000 files, check speed
+-
+    I read the 1000 files, check speed
+-
+    I move the 1000 files to 'Test-Folder2'
+-
\ No newline at end of file
diff --git a/addons/document_ftp/test/document_ftp_test3.yml b/addons/document_ftp/test/document_ftp_test3.yml
new file mode 100644
index 00000000000..c83af1b3c78
--- /dev/null
+++ b/addons/document_ftp/test/document_ftp_test3.yml
@@ -0,0 +1,25 @@
+-
+    In order to check international character functionality
+-
+    I create in the server a folder called 'Δοκιμαστικός Φάκελλος'
+-
+    I check that this folder exists at the server
+-
+    I login with FTP and check that 'Δοκιμαστικός Φάκελλος' is there
+-
+    I create a file named 'Δοκιμή' into that folder
+-
+    I cerate another folder called 'δοκ. directory 2' in there
+-
+    I remove the 'δοκ. directory 2'
+-
+    I remove the 'Δοκιμή' file
+-
+    I rename 'Δοκιμαστικός Φάκελλος' into 'άλλος'
+-
+    I place a file 'file Φ3' in 'άλλος'
+-
+    I rename the file into file+range(1..200) (large filename)
+-
+    I delete the file with the large name
+-
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
new file mode 100644
index 00000000000..05ddef1c97b
--- /dev/null
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -0,0 +1,34 @@
+-
+    In order to check dynamic folder functionality of document + FTP
+-
+    I create two partners 'Partner1' and 'Partner2'
+-|
+    I create three partner categories: 'none', 'pat1' and 'all'
+    I attach Partner1 to pat1, Partner1+Partner2 to 'all'
+-
+    I create a resource folder of partners, by the (none, pat1, all) 
+    categories.
+-
+    I browse through ftp in the resource folder, checking that three
+    categories are there.
+-
+    I create a 'partners' folder by the first resource one.
+-
+    I check through FTP that the correct partners are listed at each
+    'partners' folder.
+-
+    I create an ir.attachment, attached (not related) to Partner1
+    
+-
+    I check that pat1/Partner1 folder has the file.
+    I check that all/Partner1 folder has the file
+-
+    I place a file at the 'pat1'/Partner1 folder, through FTP
+-
+    I check at the server that the file is attached to Partner1
+-
+    I check that all/Partner1 also has the file
+- |
+    Bonus Piste:
+    I create a 'Partner3' under 'all'
+-