diff --git a/lib/OpenQA/CacheService/Model/Cache.pm b/lib/OpenQA/CacheService/Model/Cache.pm
index 32e88a397604..7686954f8498 100644
--- a/lib/OpenQA/CacheService/Model/Cache.pm
+++ b/lib/OpenQA/CacheService/Model/Cache.pm
@@ -159,7 +159,7 @@ sub track_asset ($self, $asset) {
     eval {
         my $db = $self->sqlite->db;
         my $tx = $db->begin('exclusive');
-        my $sql = "INSERT INTO assets (filename, size, last_use) VALUES (?, 0, strftime('%s','now'))" . "ON CONFLICT (filename) DO UPDATE SET pending=1";
+        my $sql = "INSERT INTO assets (filename, size, last_use) VALUES (?, 0, strftime('%s','now')) ON CONFLICT (filename) DO UPDATE SET pending=1";
         $db->query($sql, $asset);
         $tx->commit;
     };
diff --git a/lib/OpenQA/Schema/ResultSet/Assets.pm b/lib/OpenQA/Schema/ResultSet/Assets.pm
index 0ee9f4f20791..d5c130565acb 100644
--- a/lib/OpenQA/Schema/ResultSet/Assets.pm
+++ b/lib/OpenQA/Schema/ResultSet/Assets.pm
@@ -251,7 +251,7 @@ sub status {
 
                     # check whether the data from the 2nd select is inconsistent with what we've got from the 1st
                     # (pure pre-caution, shouldn't happen due to the transaction)
-                    die "$asset_info->{name} was scheduled during cleanup" . " (max job initially $init_max_job, now $res_max_job)"
+                    die "$asset_info->{name} was scheduled during cleanup (max job initially $init_max_job, now $res_max_job)"
                       if $fail_on_inconsistent_status && $res_max_job && ($res_max_job > $init_max_job);
                 }
             }
diff --git a/lib/OpenQA/Task/Asset/Limit.pm b/lib/OpenQA/Task/Asset/Limit.pm
index 7848057a60bb..082dda2f2ad5 100644
--- a/lib/OpenQA/Task/Asset/Limit.pm
+++ b/lib/OpenQA/Task/Asset/Limit.pm
@@ -116,7 +116,7 @@ sub _limit {
 
             my $age_in_days = $age->delta_days($now)->in_units('days');
             if ($age_in_days >= $limit_in_days) {
-                _remove_if($schema, $asset, "Removing asset $asset_name (not in any group, age " . "($age_in_days days) exceeds limit ($limit_in_days days)");
+                _remove_if($schema, $asset, "Removing asset $asset_name (not in any group, age ($age_in_days days) exceeds limit ($limit_in_days days)");
             }
             else {
                 my $limit = $age->add(days => $limit_in_days);
diff --git a/lib/OpenQA/Task/Utils.pm b/lib/OpenQA/Task/Utils.pm
index fd5342ad34c7..6e1c13e865c8 100644
--- a/lib/OpenQA/Task/Utils.pm
+++ b/lib/OpenQA/Task/Utils.pm
@@ -43,7 +43,7 @@ sub finish_job_if_disk_usage_below_percentage (%args) {
 
     my $free_percentage = $available_bytes / $total_bytes * 100;
     return undef if $free_percentage <= $percentage;
-    $job->finish("Skipping, free disk space on '$dir' exceeds configured percentage $percentage %" . " (free percentage: $free_percentage %)");
+    $job->finish("Skipping, free disk space on '$dir' exceeds configured percentage $percentage % (free percentage: $free_percentage %)");
     return 1;
 }
 
diff --git a/lib/OpenQA/WebAPI/Controller/API/V1/Job.pm b/lib/OpenQA/WebAPI/Controller/API/V1/Job.pm
index 95fb9873e60e..61d52fca3a25 100644
--- a/lib/OpenQA/WebAPI/Controller/API/V1/Job.pm
+++ b/lib/OpenQA/WebAPI/Controller/API/V1/Job.pm
@@ -529,7 +529,7 @@ sub update_status ($self) {
         }
         else {
             my $job_status = $job->status_info;
-            my $err = "Got status update for job $job_id and worker $worker_id but there is" . " not even a worker assigned to this job (job is $job_status)";
+            my $err = "Got status update for job $job_id and worker $worker_id but there is not even a worker assigned to this job (job is $job_status)";
             log_info($err);
             return $self->render(json => {error => $err}, status => 400);
         }
@@ -538,7 +538,7 @@ sub update_status ($self) {
     if (!$worker || $worker->id != $worker_id) {
         my $expected_worker_id = $worker ? $worker->id : 'no updates anymore';
         my $job_status = $job->status_info;
-        my $err = "Got status update for job $job_id with unexpected worker ID $worker_id" . " (expected $expected_worker_id, job is $job_status)";
+        my $err = "Got status update for job $job_id with unexpected worker ID $worker_id (expected $expected_worker_id, job is $job_status)";
         log_info($err);
         return $self->render(json => {error => $err}, status => 400);
     }
diff --git a/lib/OpenQA/WebSockets/Controller/Worker.pm b/lib/OpenQA/WebSockets/Controller/Worker.pm
index 1cbbfac6dd7e..02983c32a797 100644
--- a/lib/OpenQA/WebSockets/Controller/Worker.pm
+++ b/lib/OpenQA/WebSockets/Controller/Worker.pm
@@ -153,7 +153,7 @@ sub _message {
         # (the status "working" is special because it will be sent immediately after a worker started a new job)
         my ($last_seen, $now) = ($worker_status->{last_seen}, time);
         if ($last_seen && ($last_seen + MIN_TIMER) > $now) {
-            log_info("Received worker $worker_id status too close to the last update," . " websocket server possibly overloaded or worker misconfigured")
+            log_info("Received worker $worker_id status too close to the last update, websocket server possibly overloaded or worker misconfigured")
               if $current_worker_status ne 'working';
         }
         $worker_status->{last_seen} = $now;
diff --git a/lib/OpenQA/Worker/CommandHandler.pm b/lib/OpenQA/Worker/CommandHandler.pm
index 3cc31661608f..7e635316762d 100644
--- a/lib/OpenQA/Worker/CommandHandler.pm
+++ b/lib/OpenQA/Worker/CommandHandler.pm
@@ -79,7 +79,7 @@ sub handle_command {
         else {
             # ignore messages which belong to a job
             if (defined $job_id) {
-                log_warning("Ignoring WS message from $webui_host with type $type and job ID $job_id " . "(currently not executing a job):\n" . pp($json));
+                log_warning("Ignoring WS message from $webui_host with type $type and job ID $job_id (currently not executing a job):\n" . pp($json));
                 return undef;
             }
         }
diff --git a/t/16-markdown.t b/t/16-markdown.t
index d0a28bd51d16..6e1926709d78 100644
--- a/t/16-markdown.t
+++ b/t/16-markdown.t
@@ -132,7 +132,7 @@ subtest 'bugrefs to markdown' => sub {
       '[gfs#flatpak/fedora-flatpaks#26](https://gitlab.com/fedora/sigs/flatpak/fedora-flatpaks/issues/26)',
       'right markdown';
     is bugref_to_markdown("boo#9876\n\ntest boo#211\n"),
-      "[boo#9876](https://bugzilla.opensuse.org/show_bug.cgi?id=9876)\n\n" . "test [boo#211](https://bugzilla.opensuse.org/show_bug.cgi?id=211)\n",
+      "[boo#9876](https://bugzilla.opensuse.org/show_bug.cgi?id=9876)\n\ntest [boo#211](https://bugzilla.opensuse.org/show_bug.cgi?id=211)\n",
       'right markdown';
     is bugref_to_markdown('label:force_result:passed:bsc#1234'), 'label:force_result:passed:bsc#1234', 'right markdown';
 };
diff --git a/t/api/02-iso.t b/t/api/02-iso.t
index 654016894d18..66d73143ebc1 100644
--- a/t/api/02-iso.t
+++ b/t/api/02-iso.t
@@ -531,7 +531,7 @@ subtest 'Handling different WORKER_CLASS in directly chained dependency chains'
 
 for my $machine_separator (qw(@ :)) {
     $schema->txn_begin;
-    subtest "Create dependency for jobs on different machines" . " - dependency setting are correct (using machine separator '$machine_separator')" => sub {
+    subtest "Create dependency for jobs on different machines - dependency setting are correct (using machine separator '$machine_separator')" => sub {
         $t->post_ok('/api/v1/machines', form => {name => '64bit-ipmi', backend => 'ipmi', 'settings[TEST]' => 'ipmi'})->status_is(200);
         add_opensuse_test('supportserver1');
         add_opensuse_test('supportserver2', MACHINE => ['64bit-ipmi']);
diff --git a/t/api/15-search.t b/t/api/15-search.t
index a3f0159aedd5..db0f3db57b52 100644
--- a/t/api/15-search.t
+++ b/t/api/15-search.t
@@ -64,7 +64,7 @@ subtest 'Job modules' => sub {
     $t->json_is(
         '/data/0' => {
             occurrence => 'lorem',
-            contents => "tests/lorem/ipsum.pm\n" . "tests/lorem/ipsum_dolor.py"
+            contents => "tests/lorem/ipsum.pm\ntests/lorem/ipsum_dolor.py"
         },
         'job module found'
     );