diff --git a/needles/kde/apps/vault/vault_create.json b/needles/kde/apps/vault/vault_create.json
new file mode 100644
index 00000000..792e30fe
--- /dev/null
+++ b/needles/kde/apps/vault/vault_create.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_create"
+  ],
+  "area": [
+    {
+      "xpos": 474,
+      "ypos": 670,
+      "width": 64,
+      "height": 15,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_create.png b/needles/kde/apps/vault/vault_create.png
new file mode 100644
index 00000000..9c8b5580
Binary files /dev/null and b/needles/kde/apps/vault/vault_create.png differ
diff --git a/needles/kde/apps/vault/vault_dialog_runs.json b/needles/kde/apps/vault/vault_dialog_runs.json
new file mode 100644
index 00000000..f6cc6b8d
--- /dev/null
+++ b/needles/kde/apps/vault/vault_dialog_runs.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_dialog_runs"
+  ],
+  "area": [
+    {
+      "xpos": 214,
+      "ypos": 173,
+      "width": 119,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_dialog_runs.png b/needles/kde/apps/vault/vault_dialog_runs.png
new file mode 100644
index 00000000..78c25857
Binary files /dev/null and b/needles/kde/apps/vault/vault_dialog_runs.png differ
diff --git a/needles/kde/apps/vault/vault_encfs_backend_available.json b/needles/kde/apps/vault/vault_encfs_backend_available.json
new file mode 100644
index 00000000..1c9f8392
--- /dev/null
+++ b/needles/kde/apps/vault/vault_encfs_backend_available.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_encfs_backend_available"
+  ],
+  "area": [
+    {
+      "xpos": 32,
+      "ypos": 100,
+      "width": 103,
+      "height": 20,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_encfs_backend_available.png b/needles/kde/apps/vault/vault_encfs_backend_available.png
new file mode 100644
index 00000000..cd47b489
Binary files /dev/null and b/needles/kde/apps/vault/vault_encfs_backend_available.png differ
diff --git a/needles/kde/apps/vault/vault_enter_name.json b/needles/kde/apps/vault/vault_enter_name.json
new file mode 100644
index 00000000..8946d555
--- /dev/null
+++ b/needles/kde/apps/vault/vault_enter_name.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_enter_name"
+  ],
+  "area": [
+    {
+      "xpos": 68,
+      "ypos": 43,
+      "width": 180,
+      "height": 38,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_enter_name.png b/needles/kde/apps/vault/vault_enter_name.png
new file mode 100644
index 00000000..9e40d289
Binary files /dev/null and b/needles/kde/apps/vault/vault_enter_name.png differ
diff --git a/needles/kde/apps/vault/vault_enter_password.json b/needles/kde/apps/vault/vault_enter_password.json
new file mode 100644
index 00000000..4d2f1a71
--- /dev/null
+++ b/needles/kde/apps/vault/vault_enter_password.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_enter_password"
+  ],
+  "area": [
+    {
+      "xpos": 38,
+      "ypos": 93,
+      "width": 196,
+      "height": 34,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_enter_password.png b/needles/kde/apps/vault/vault_enter_password.png
new file mode 100644
index 00000000..385bdea1
Binary files /dev/null and b/needles/kde/apps/vault/vault_enter_password.png differ
diff --git a/needles/kde/apps/vault/vault_menu_create_new.json b/needles/kde/apps/vault/vault_menu_create_new.json
new file mode 100644
index 00000000..312dd5bc
--- /dev/null
+++ b/needles/kde/apps/vault/vault_menu_create_new.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_menu_create_new"
+  ],
+  "area": [
+    {
+      "xpos": 730,
+      "ypos": 542,
+      "width": 148,
+      "height": 16,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_menu_create_new.png b/needles/kde/apps/vault/vault_menu_create_new.png
new file mode 100644
index 00000000..e9c6cf29
Binary files /dev/null and b/needles/kde/apps/vault/vault_menu_create_new.png differ
diff --git a/needles/kde/apps/vault/vault_menu_not_exist.json b/needles/kde/apps/vault/vault_menu_not_exist.json
new file mode 100644
index 00000000..9b272cd7
--- /dev/null
+++ b/needles/kde/apps/vault/vault_menu_not_exist.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_menu_not_exist"
+  ],
+  "area": [
+    {
+      "xpos": 693,
+      "ypos": 492,
+      "width": 221,
+      "height": 23,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_menu_not_exist.png b/needles/kde/apps/vault/vault_menu_not_exist.png
new file mode 100644
index 00000000..b7efbd71
Binary files /dev/null and b/needles/kde/apps/vault/vault_menu_not_exist.png differ
diff --git a/needles/kde/apps/vault/vault_menu_open.json b/needles/kde/apps/vault/vault_menu_open.json
new file mode 100644
index 00000000..f989d61e
--- /dev/null
+++ b/needles/kde/apps/vault/vault_menu_open.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_menu_open"
+  ],
+  "area": [
+    {
+      "xpos": 628,
+      "ypos": 449,
+      "width": 26,
+      "height": 26,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_menu_open.png b/needles/kde/apps/vault/vault_menu_open.png
new file mode 100644
index 00000000..d50247fa
Binary files /dev/null and b/needles/kde/apps/vault/vault_menu_open.png differ
diff --git a/needles/kde/apps/vault/vault_mountpoint.json b/needles/kde/apps/vault/vault_mountpoint.json
new file mode 100644
index 00000000..e7db439d
--- /dev/null
+++ b/needles/kde/apps/vault/vault_mountpoint.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_mountpoint"
+  ],
+  "area": [
+    {
+      "xpos": 31,
+      "ypos": 64,
+      "width": 83,
+      "height": 21,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_mountpoint.png b/needles/kde/apps/vault/vault_mountpoint.png
new file mode 100644
index 00000000..4edcaab9
Binary files /dev/null and b/needles/kde/apps/vault/vault_mountpoint.png differ
diff --git a/needles/kde/apps/vault/vault_new_created.json b/needles/kde/apps/vault/vault_new_created.json
new file mode 100644
index 00000000..fe003bc9
--- /dev/null
+++ b/needles/kde/apps/vault/vault_new_created.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_new_created"
+  ],
+  "area": [
+    {
+      "xpos": 593,
+      "ypos": 345,
+      "width": 93,
+      "height": 28,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_new_created.png b/needles/kde/apps/vault/vault_new_created.png
new file mode 100644
index 00000000..7bd99b28
Binary files /dev/null and b/needles/kde/apps/vault/vault_new_created.png differ
diff --git a/needles/kde/apps/vault/vault_security_notice.json b/needles/kde/apps/vault/vault_security_notice.json
new file mode 100644
index 00000000..3b876555
--- /dev/null
+++ b/needles/kde/apps/vault/vault_security_notice.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_security_notice"
+  ],
+  "area": [
+    {
+      "xpos": 33,
+      "ypos": 48,
+      "width": 105,
+      "height": 16,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_security_notice.png b/needles/kde/apps/vault/vault_security_notice.png
new file mode 100644
index 00000000..e5d2971e
Binary files /dev/null and b/needles/kde/apps/vault/vault_security_notice.png differ
diff --git a/needles/kde/apps/vault/vault_tray_icon.json b/needles/kde/apps/vault/vault_tray_icon.json
new file mode 100644
index 00000000..09d34489
--- /dev/null
+++ b/needles/kde/apps/vault/vault_tray_icon.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_tray_icon"
+  ],
+  "area": [
+    {
+      "xpos": 759,
+      "ypos": 738,
+      "width": 18,
+      "height": 18,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_tray_icon.png b/needles/kde/apps/vault/vault_tray_icon.png
new file mode 100644
index 00000000..8071e0dc
Binary files /dev/null and b/needles/kde/apps/vault/vault_tray_icon.png differ
diff --git a/needles/kde/apps/vault/vault_verify_password.json b/needles/kde/apps/vault/vault_verify_password.json
new file mode 100644
index 00000000..e36680f6
--- /dev/null
+++ b/needles/kde/apps/vault/vault_verify_password.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "vault_verify_password"
+  ],
+  "area": [
+    {
+      "xpos": 62,
+      "ypos": 130,
+      "width": 155,
+      "height": 36,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/vault/vault_verify_password.png b/needles/kde/apps/vault/vault_verify_password.png
new file mode 100644
index 00000000..17105e01
Binary files /dev/null and b/needles/kde/apps/vault/vault_verify_password.png differ
diff --git a/needles/kde/kde_next-20210609.json b/needles/kde/kde_next-20210609.json
new file mode 100644
index 00000000..47b2fc61
--- /dev/null
+++ b/needles/kde/kde_next-20210609.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 16,
+      "xpos": 482,
+      "width": 48,
+      "ypos": 524
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "kde_next"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/kde_next-20210609.png b/needles/kde/kde_next-20210609.png
new file mode 100644
index 00000000..12746802
Binary files /dev/null and b/needles/kde/kde_next-20210609.png differ
diff --git a/needles/kde/kde_next-noto-20210609.json b/needles/kde/kde_next-noto-20210609.json
new file mode 100644
index 00000000..6a8b34f2
--- /dev/null
+++ b/needles/kde/kde_next-noto-20210609.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 523,
+      "width": 48,
+      "xpos": 481,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "kde_next"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/kde_next-noto-20210609.png b/needles/kde/kde_next-noto-20210609.png
new file mode 100644
index 00000000..76884888
Binary files /dev/null and b/needles/kde/kde_next-noto-20210609.png differ
diff --git a/needles/kde/show_hidden_icons.json b/needles/kde/show_hidden_icons.json
new file mode 100644
index 00000000..71fb830b
--- /dev/null
+++ b/needles/kde/show_hidden_icons.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "show_hidden_icons"
+  ],
+  "area": [
+    {
+      "xpos": 873,
+      "ypos": 736,
+      "width": 27,
+      "height": 22,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/show_hidden_icons.png b/needles/kde/show_hidden_icons.png
new file mode 100644
index 00000000..a09aada5
Binary files /dev/null and b/needles/kde/show_hidden_icons.png differ
diff --git a/tests/apps_startstop/kde/disks.pm b/tests/apps_startstop/kde/disks.pm
new file mode 100644
index 00000000..21cf19e3
--- /dev/null
+++ b/tests/apps_startstop/kde/disks.pm
@@ -0,0 +1,26 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test checks that Disks starts.
+
+sub run {
+    my $self = shift;
+    
+    # Start the application
+    menu_launch_type 'disks';
+    # Check that it is started
+    assert_screen 'disks_runs';
+    # Close the application
+    quit_with_shortcut();
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/apps_startstop/kde/vault.pm b/tests/apps_startstop/kde/vault.pm
new file mode 100644
index 00000000..590eaeb3
--- /dev/null
+++ b/tests/apps_startstop/kde/vault.pm
@@ -0,0 +1,78 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test checks that Vault starts.
+
+sub run {
+    my $self = shift;
+    # As there are no vaults created, we need to list
+    # invisible icons.
+    assert_and_click "show_hidden_icons";
+
+    # Now we should be able to see the Vaults icon,
+    # so we will click on it.
+    assert_and_click "vault_menu_open";
+
+    # This is a new installation so there, should not be
+    # any existing vaults. Let's check for it.
+    assert_screen "vault_menu_not_exist";
+
+    # Click on Create a New ... to start the vault creation
+    assert_and_click "vault_menu_create_new";
+
+    # A vault creation dialog should appear
+    assert_screen "vault_dialog_runs";
+
+    # Check that a correct backend is available
+    assert_screen "vault_encfs_backend_available";
+
+    # Enter the name of the newly created testvault
+    assert_and_click "vault_enter_name";
+    
+    # Then name the vault "testvault"
+    type_very_safely "testvault";
+
+    # Click the Next button
+    assert_and_click "kde_next";
+
+    # If the security notice appears, click next it away.
+    if (check_screen "vault_security_notice") {
+        assert_and_click "kde_next";
+    }
+
+    # Enter a password and validate it.
+    assert_and_click "vault_enter_password";
+    type_very_safely "SecretVaultCode";
+    send_key "tab";
+    type_very_safely "SecretVaultCode";
+
+    assert_and_click "kde_next";
+
+    # Check that a mountpount screen appears
+    assert_screen "vault_mountpoint";
+
+    # Click Next to confirm
+    assert_and_click "kde_next";
+
+    # Click on Create to make it happen
+    assert_and_click "vault_create";
+
+    # Now the vault should be created so let us check, that it really
+    # got created.
+    # There should be a new small vault icon visible in the tray, so let's
+    # click that to open the vault menu.
+    assert_and_click "vault_tray_icon";
+    # Check that the vault is listed in the overview
+    assert_screen "vault_new_created";
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+
+1;
+
+# vim: set sw=4 et: