diff --git a/templates b/templates
index 8cde798d..7782a9dc 100755
--- a/templates
+++ b/templates
@@ -226,6 +226,17 @@
                                     },
                       test_suite => { name => "base_services_start" },
                     },
+                    {
+                      machine    => { name => "ARM" },
+                      prio       => 62,
+                      product    => {
+                                      arch    => "arm",
+                                      distri  => "fedora",
+                                      flavor  => "Minimal-raw_xz-raw.xz",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "base_services_start_arm" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 40,
@@ -1221,6 +1232,10 @@
                       name => "install_arm_image_deployment_upload",
                       settings => [
                         { key => "ENTRYPOINT", value => "install_arm_image_deployment" },
+                        # we don't want HDD_2 to be really connected, but we need to use it to download
+                        # HDD ISO, see https://github.com/os-autoinst/openQA/issues/684
+                        { key => "NUMDISKS", value => "1" },
+                        { key => "HDD_1", value => "%HDD_2%" },
                         { key => "STORE_HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
                       ],
                     },
@@ -1555,6 +1570,15 @@
                         { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
                       ],
                     },
+                    {
+                      name => "base_services_start_arm",
+                      settings => [
+                        { key => "ENTRYPOINT", value => "base_services_start" },
+                        { key => "START_AFTER_TEST", value => "install_arm_image_deployment_upload" },
+                        { key => "NUMDISKS", value => "1" },
+                        { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
+                      ],
+                    },
                     {
                       name => "base_service_manipulation",
                       settings => [
diff --git a/tests/base_services_start.pm b/tests/base_services_start.pm
index a5f3d69a..1783f77f 100644
--- a/tests/base_services_start.pm
+++ b/tests/base_services_start.pm
@@ -4,8 +4,13 @@ use testapi;
 
 sub run {
     my $self=shift;
-    # wait for boot to complete
-    $self->boot_to_login_screen("", 30);
+    if (get_var("ARCH") eq "arm") {
+        # we cannot use boot_to_login_screen, wait_still_screen is unusable during ARM boot (it shows black screen for first few minutes)
+        assert_screen "text_console_login", 150;
+    } else {
+        # wait for boot to complete
+        $self->boot_to_login_screen("", 30);
+    }
     # switch to TTY3 for both, graphical and console tests
     $self->root_console(tty=>3);
     validate_script_output 'systemctl --failed', sub { $_ =~ m/0 loaded units/ };