diff --git a/needles/gnome/apps/clocks/clocks_add_city.json b/needles/gnome/apps/clocks/clocks_add_city.json
new file mode 100644
index 00000000..578f02c0
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_add_city.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_add_city"
+  ],
+  "area": [
+    {
+      "xpos": 668,
+      "ypos": 352,
+      "width": 32,
+      "height": 19,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_add_city.png b/needles/gnome/apps/clocks/clocks_add_city.png
new file mode 100644
index 00000000..57c7ec1f
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_add_city.png differ
diff --git a/needles/gnome/apps/clocks/clocks_alarm_added.json b/needles/gnome/apps/clocks/clocks_alarm_added.json
new file mode 100644
index 00000000..aeafdfe6
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_alarm_added.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_alarm_added"
+  ],
+  "area": [
+    {
+      "xpos": 107,
+      "ypos": 337,
+      "width": 71,
+      "height": 37,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_alarm_added.png b/needles/gnome/apps/clocks/clocks_alarm_added.png
new file mode 100644
index 00000000..88ee51f2
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_alarm_added.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm.json b/needles/gnome/apps/clocks/clocks_button_alarm.json
new file mode 100644
index 00000000..4e76bbf0
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_alarm.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_alarm"
+  ],
+  "area": [
+    {
+      "xpos": 428,
+      "ypos": 42,
+      "width": 47,
+      "height": 18,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm.png b/needles/gnome/apps/clocks/clocks_button_alarm.png
new file mode 100644
index 00000000..92cfce6b
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_alarm.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_continue.json b/needles/gnome/apps/clocks/clocks_button_continue.json
new file mode 100644
index 00000000..4251ccd3
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_continue.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_continue"
+  ],
+  "area": [
+    {
+      "xpos": 238,
+      "ypos": 464,
+      "width": 79,
+      "height": 20,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_continue.png b/needles/gnome/apps/clocks/clocks_button_continue.png
new file mode 100644
index 00000000..e91b89f3
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_continue.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_delete.json b/needles/gnome/apps/clocks/clocks_button_delete.json
new file mode 100644
index 00000000..0d7e6a1d
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_delete.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_delete"
+  ],
+  "area": [
+    {
+      "xpos": 956,
+      "ypos": 737,
+      "width": 48,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_delete.png b/needles/gnome/apps/clocks/clocks_button_delete.png
new file mode 100644
index 00000000..4fccbd54
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_delete.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_menu.json b/needles/gnome/apps/clocks/clocks_button_menu.json
new file mode 100644
index 00000000..c081ee8a
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_menu.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_menu"
+  ],
+  "area": [
+    {
+      "xpos": 944,
+      "ypos": 43,
+      "width": 16,
+      "height": 16,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_menu.png b/needles/gnome/apps/clocks/clocks_button_menu.png
new file mode 100644
index 00000000..2b47e71f
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_menu.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_new.json b/needles/gnome/apps/clocks/clocks_button_new.json
new file mode 100644
index 00000000..ab2982cd
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_new.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_new"
+  ],
+  "area": [
+    {
+      "xpos": 22,
+      "ypos": 41,
+      "width": 35,
+      "height": 19,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_new.png b/needles/gnome/apps/clocks/clocks_button_new.png
new file mode 100644
index 00000000..04ad67bb
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_new.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_pause.json b/needles/gnome/apps/clocks/clocks_button_pause.json
new file mode 100644
index 00000000..06c05857
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_pause.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_pause"
+  ],
+  "area": [
+    {
+      "xpos": 410,
+      "ypos": 497,
+      "width": 54,
+      "height": 19,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_pause.png b/needles/gnome/apps/clocks/clocks_button_pause.png
new file mode 100644
index 00000000..99b5206e
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_pause.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_reset.json b/needles/gnome/apps/clocks/clocks_button_reset.json
new file mode 100644
index 00000000..6cdbdea4
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_reset.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_reset"
+  ],
+  "area": [
+    {
+      "xpos": 400,
+      "ypos": 462,
+      "width": 52,
+      "height": 22,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_reset.png b/needles/gnome/apps/clocks/clocks_button_reset.png
new file mode 100644
index 00000000..57f75b78
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_reset.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_start.json b/needles/gnome/apps/clocks/clocks_button_start.json
new file mode 100644
index 00000000..62a6218e
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_start.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_start"
+  ],
+  "area": [
+    {
+      "xpos": 254,
+      "ypos": 463,
+      "width": 48,
+      "height": 20,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_start.png b/needles/gnome/apps/clocks/clocks_button_start.png
new file mode 100644
index 00000000..5aee366e
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_start.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_stop.json b/needles/gnome/apps/clocks/clocks_button_stop.json
new file mode 100644
index 00000000..5b0645e2
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_stop.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_stop"
+  ],
+  "area": [
+    {
+      "xpos": 254,
+      "ypos": 463,
+      "width": 48,
+      "height": 20,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_stop.png b/needles/gnome/apps/clocks/clocks_button_stop.png
new file mode 100644
index 00000000..1ac0ebfe
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_stop.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_stopwatch.json b/needles/gnome/apps/clocks/clocks_button_stopwatch.json
new file mode 100644
index 00000000..6d1073f9
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_stopwatch.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_stopwatch"
+  ],
+  "area": [
+    {
+      "xpos": 534,
+      "ypos": 42,
+      "width": 78,
+      "height": 18,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_stopwatch.png b/needles/gnome/apps/clocks/clocks_button_stopwatch.png
new file mode 100644
index 00000000..4058ad42
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_stopwatch.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_timer.json b/needles/gnome/apps/clocks/clocks_button_timer.json
new file mode 100644
index 00000000..e6b8d623
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_button_timer.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_button_timer"
+  ],
+  "area": [
+    {
+      "xpos": 672,
+      "ypos": 42,
+      "width": 44,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_timer.png b/needles/gnome/apps/clocks/clocks_button_timer.png
new file mode 100644
index 00000000..56649d7c
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_button_timer.png differ
diff --git a/needles/gnome/apps/clocks/clocks_check_minute.json b/needles/gnome/apps/clocks/clocks_check_minute.json
new file mode 100644
index 00000000..c6373c51
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_check_minute.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_check_minute"
+  ],
+  "area": [
+    {
+      "xpos": 456,
+      "ypos": 365,
+      "width": 97,
+      "height": 56,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_check_minute.png b/needles/gnome/apps/clocks/clocks_check_minute.png
new file mode 100644
index 00000000..99b5206e
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_check_minute.png differ
diff --git a/needles/gnome/apps/clocks/clocks_check_reset.json b/needles/gnome/apps/clocks/clocks_check_reset.json
new file mode 100644
index 00000000..276a8176
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_check_reset.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_check_reset"
+  ],
+  "area": [
+    {
+      "xpos": 319,
+      "ypos": 367,
+      "width": 54,
+      "height": 50,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_check_reset.png b/needles/gnome/apps/clocks/clocks_check_reset.png
new file mode 100644
index 00000000..b84b725f
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_check_reset.png differ
diff --git a/needles/gnome/apps/clocks/clocks_check_thirty.json b/needles/gnome/apps/clocks/clocks_check_thirty.json
new file mode 100644
index 00000000..1c40fa84
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_check_thirty.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_check_thirty"
+  ],
+  "area": [
+    {
+      "xpos": 325,
+      "ypos": 367,
+      "width": 52,
+      "height": 50,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_check_thirty.png b/needles/gnome/apps/clocks/clocks_check_thirty.png
new file mode 100644
index 00000000..c1cdce6d
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_check_thirty.png differ
diff --git a/needles/gnome/apps/clocks/clocks_check_treset.json b/needles/gnome/apps/clocks/clocks_check_treset.json
new file mode 100644
index 00000000..11baa9a8
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_check_treset.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_check_treset"
+  ],
+  "area": [
+    {
+      "xpos": 477,
+      "ypos": 366,
+      "width": 74,
+      "height": 53,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_check_treset.png b/needles/gnome/apps/clocks/clocks_check_treset.png
new file mode 100644
index 00000000..846f50b2
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_check_treset.png differ
diff --git a/needles/gnome/apps/clocks/clocks_check_twenty.json b/needles/gnome/apps/clocks/clocks_check_twenty.json
new file mode 100644
index 00000000..30103115
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_check_twenty.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_check_twenty"
+  ],
+  "area": [
+    {
+      "xpos": 322,
+      "ypos": 366,
+      "width": 49,
+      "height": 51,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_check_twenty.png b/needles/gnome/apps/clocks/clocks_check_twenty.png
new file mode 100644
index 00000000..1ac0ebfe
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_check_twenty.png differ
diff --git a/needles/gnome/apps/clocks/clocks_city_added.json b/needles/gnome/apps/clocks/clocks_city_added.json
new file mode 100644
index 00000000..ad611c88
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_city_added.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_city_added"
+  ],
+  "area": [
+    {
+      "xpos": 431,
+      "ypos": 351,
+      "width": 125,
+      "height": 22,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_city_added.png b/needles/gnome/apps/clocks/clocks_city_added.png
new file mode 100644
index 00000000..ef09192f
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_city_added.png differ
diff --git a/needles/gnome/apps/clocks/clocks_search_city.json b/needles/gnome/apps/clocks/clocks_search_city.json
new file mode 100644
index 00000000..14ac9388
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_search_city.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_search_city"
+  ],
+  "area": [
+    {
+      "xpos": 336,
+      "ypos": 457,
+      "width": 117,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_search_city.png b/needles/gnome/apps/clocks/clocks_search_city.png
new file mode 100644
index 00000000..b5c87f40
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_search_city.png differ
diff --git a/needles/gnome/apps/clocks/clocks_select.json b/needles/gnome/apps/clocks/clocks_select.json
new file mode 100644
index 00000000..cf231159
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_select.json
@@ -0,0 +1,16 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_select_clock",
+    "clocks_select"
+  ],
+  "area": [
+    {
+      "xpos": 901,
+      "ypos": 42,
+      "width": 19,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_select.png b/needles/gnome/apps/clocks/clocks_select.png
new file mode 100644
index 00000000..8e12fb36
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_select.png differ
diff --git a/needles/gnome/apps/clocks/clocks_set_alarm.json b/needles/gnome/apps/clocks/clocks_set_alarm.json
new file mode 100644
index 00000000..8509f71e
--- /dev/null
+++ b/needles/gnome/apps/clocks/clocks_set_alarm.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "clocks_set_alarm"
+  ],
+  "area": [
+    {
+      "xpos": 749,
+      "ypos": 235,
+      "width": 40,
+      "height": 21,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_set_alarm.png b/needles/gnome/apps/clocks/clocks_set_alarm.png
new file mode 100644
index 00000000..d76dcb27
Binary files /dev/null and b/needles/gnome/apps/clocks/clocks_set_alarm.png differ
diff --git a/tests/apps_startstop/gnome/clocks/add_alarm.pm b/tests/apps_startstop/gnome/clocks/add_alarm.pm
new file mode 100644
index 00000000..8cab0fd8
--- /dev/null
+++ b/tests/apps_startstop/gnome/clocks/add_alarm.pm
@@ -0,0 +1,42 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# Add and remove alarm in the Clocks application.
+
+sub run {
+    my $self = shift;
+    # Click on Alarm
+    assert_and_click 'clocks_button_alarm';
+    assert_and_click 'clocks_button_new';
+    wait_still_screen 2;
+    # Set alarm to some time and name it
+    type_very_safely '07';
+    send_key 'tab';
+    type_very_safely '28';
+    send_key 'tab';
+    type_very_safely 'MyAlarm';
+    assert_and_click 'clocks_set_alarm';
+    wait_still_screen 2;
+    # Test that it was added.
+    assert_screen 'clocks_alarm_added';
+
+    # Select alarm
+    assert_and_click 'clocks_select';
+    assert_and_click 'clocks_alarm_added';
+    # Remove alarm
+    assert_and_click 'clocks_button_delete';
+    wait_still_screen 2;
+    # Test that it was removed.
+    die "Alarm was not removed!" if (check_screen 'clocks_alarm_added', 1)
+    
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/apps_startstop/gnome/clocks/add_clock.pm b/tests/apps_startstop/gnome/clocks/add_clock.pm
new file mode 100644
index 00000000..7854b7d5
--- /dev/null
+++ b/tests/apps_startstop/gnome/clocks/add_clock.pm
@@ -0,0 +1,39 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# Add and remove new world clock in the application.
+
+sub run {
+    my $self = shift;
+    # Add a new clock
+    # Click on New
+    assert_and_click 'clocks_button_new';
+    wait_still_screen 2;
+    # Write a location to add and select it
+    type_very_safely 'alexandria';
+    assert_and_click 'clocks_search_city';
+    assert_and_click 'clocks_add_city';
+    # Test that it was added.
+    assert_screen 'clocks_city_added';
+
+    # Remove the new clock
+    # Click on selection button
+    assert_and_click 'clocks_select';
+    # Select previously added clock
+    assert_and_click 'clocks_city_added';
+    # Delete it
+    assert_and_click 'clocks_button_delete';
+    # Check that it disappeared
+    die "The clock has not been deleted!" if (check_screen 'clocks_city_added', 1);
+    
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/apps_startstop/gnome/clocks/remove_alarm.pm b/tests/apps_startstop/gnome/clocks/remove_alarm.pm
new file mode 100644
index 00000000..8cab0fd8
--- /dev/null
+++ b/tests/apps_startstop/gnome/clocks/remove_alarm.pm
@@ -0,0 +1,42 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# Add and remove alarm in the Clocks application.
+
+sub run {
+    my $self = shift;
+    # Click on Alarm
+    assert_and_click 'clocks_button_alarm';
+    assert_and_click 'clocks_button_new';
+    wait_still_screen 2;
+    # Set alarm to some time and name it
+    type_very_safely '07';
+    send_key 'tab';
+    type_very_safely '28';
+    send_key 'tab';
+    type_very_safely 'MyAlarm';
+    assert_and_click 'clocks_set_alarm';
+    wait_still_screen 2;
+    # Test that it was added.
+    assert_screen 'clocks_alarm_added';
+
+    # Select alarm
+    assert_and_click 'clocks_select';
+    assert_and_click 'clocks_alarm_added';
+    # Remove alarm
+    assert_and_click 'clocks_button_delete';
+    wait_still_screen 2;
+    # Test that it was removed.
+    die "Alarm was not removed!" if (check_screen 'clocks_alarm_added', 1)
+    
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/apps_startstop/gnome/clocks/start.pm b/tests/apps_startstop/gnome/clocks/start.pm
new file mode 100644
index 00000000..ecf2869b
--- /dev/null
+++ b/tests/apps_startstop/gnome/clocks/start.pm
@@ -0,0 +1,25 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test checks that Clocks starts.
+
+sub run {
+    my $self = shift;
+    # Start the application
+    start_with_launcher('apps_menu_clocks');
+    # give access rights if asked
+    if (check_screen('apps_run_access', 1)) {
+        assert_and_click 'apps_run_access';
+    }
+    assert_screen 'apps_run_clocks';
+}
+
+sub test_flags {
+    return {fatal => 1, milestone => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/apps_startstop/gnome/clocks/stopwatch.pm b/tests/apps_startstop/gnome/clocks/stopwatch.pm
new file mode 100644
index 00000000..88ca5852
--- /dev/null
+++ b/tests/apps_startstop/gnome/clocks/stopwatch.pm
@@ -0,0 +1,37 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# Use stopwatch.
+
+sub run {
+    my $self = shift;
+    # Click on Stopwatch
+    assert_and_click 'clocks_button_stopwatch';
+    wait_still_screen 2;
+    # Start stopwatch
+    assert_and_click 'clocks_button_start';
+    sleep 20;
+    assert_and_click 'clocks_button_stop';
+    # Check that the stopwatch has run
+    assert_screen 'clocks_check_twenty';
+    # Continue stopwatch
+    assert_and_click 'clocks_button_continue';
+    sleep 10;
+    assert_and_click 'clocks_button_stop';
+    # Check that it has run
+    assert_screen 'clocks_check_thirty';
+    # Reset the stopwatch
+    assert_and_click 'clocks_button_reset';
+    assert_screen 'clocks_check_reset';
+
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/apps_startstop/gnome/clocks/timer.pm b/tests/apps_startstop/gnome/clocks/timer.pm
new file mode 100644
index 00000000..a7fa4bdb
--- /dev/null
+++ b/tests/apps_startstop/gnome/clocks/timer.pm
@@ -0,0 +1,35 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# Use Timer.
+
+sub run {
+    my $self = shift;
+    # Click on Timer
+    assert_and_click 'clocks_button_stopwatch';
+    wait_still_screen 2;
+    # Start timer
+    assert_and_click 'clocks_button_start';
+    sleep 40;
+    assert_and_click 'clocks_button_pause';
+    # Check that the timer has run
+    assert_screen 'clocks_check_minute';
+    # Wait some time to see that the timer waits
+    sleep 40;
+    assert_screen 'clocks_check_minute';
+    # Reset the timer
+    assert_and_click 'clocks_button_reset';
+    assert_screen 'clocks_check_treset';
+
+
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
+# vim: set sw=4 et: