diff --git a/lib/OpenQA/WebAPI/Controller/Test.pm b/lib/OpenQA/WebAPI/Controller/Test.pm
index 1855f8aa0d0..cc8808952d8 100644
--- a/lib/OpenQA/WebAPI/Controller/Test.pm
+++ b/lib/OpenQA/WebAPI/Controller/Test.pm
@@ -139,8 +139,10 @@ sub _load_scenario_definitions ($self, $preset) {
     catch ($e) {
         return $self->stash(flash_error => "Unable to read scenario definitions for the specified preset: $e")
           unless $e =~ /no.*file/i;
-        my $info = Mojo::ByteStream->new(
-            qq(You first need to <a href="#" onclick="cloneTests(this)">clone the $distri test distribution</a>.));
+        my $info
+          = Mojo::ByteStream->new(
+qq(You first need to clone the <a href="https://github.com/os-autoinst/os-autoinst-distri-$distri">$distri</a> test distribution to automatically fill out the fields: <a href="#" class="btn btn-primary" onclick="cloneTests(this)">Clone</a>)
+          );
         return $self->stash(flash_info => $info);
     }
     my $defs;
diff --git a/t/ui/29-create_tests.t b/t/ui/29-create_tests.t
index cc895271d3b..5b608bd5daa 100644
--- a/t/ui/29-create_tests.t
+++ b/t/ui/29-create_tests.t
@@ -77,10 +77,10 @@ subtest 'preset information can be loaded from INI file, note about non-existing
     unlike $flash_messages, qr/does not exist/i, 'preset defined in INI file is available';
 
     like $flash_messages,
-      qr|You first need to clone the does-not-exist test distribution|i,
+      qr|You first need to clone the .*does-not-exist.* test distribution|i,
       'note about cloning test distribution shown';
 
-    $driver->find_element_by_link_text('clone the does-not-exist test distribution')->click;
+    $driver->find_element_by_link_text('Clone')->click;
     my $error_message = wait_for_element selector => '#flash-messages .alert-danger', description => 'error message';
     like $error_message->get_text, qr/No Minion worker available/i, 'expected error shown';
 };