diff --git a/h5p/tests/h5p_file_storage_test.php b/h5p/tests/h5p_file_storage_test.php
index ef5b79ddd76..562fd4c941d 100644
--- a/h5p/tests/h5p_file_storage_test.php
+++ b/h5p/tests/h5p_file_storage_test.php
@@ -31,10 +31,9 @@ use core_h5p\helper;
 use file_archive;
 use moodle_exception;
 use ReflectionMethod;
+use stored_file;
 use zip_archive;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Test class covering the H5PFileStorage interface implementation.
  *
@@ -782,7 +781,6 @@ class h5p_file_storage_test extends \advanced_testcase {
      * Tests that the content folder of an H5P content is imported in the Moodle filesystem.
      */
     public function test_moveContentDiretory(): void {
-        global $DB;
 
         // Create temp folder.
         $tempfolder = make_request_directory(false);
@@ -818,19 +816,21 @@ class h5p_file_storage_test extends \advanced_testcase {
         $this->h5p_file_storage->moveContentDirectory($h5pcontentfolder, $targeth5pcontentid);
 
         // Get database records.
-        $sql = "SELECT concat(filepath, filename)
-                  FROM {files}
-                 WHERE filearea = :filearea AND itemid = :itemid AND component = :component AND filename != '.'";
-        $params = [
-            'component' => file_storage::COMPONENT,
-            'filearea' => file_storage::CONTENT_FILEAREA,
-            'itemid' => $targeth5pcontentid
-        ];
-        $filesdb = $DB->get_fieldset_sql($sql, $params);
-        sort($filesdb);
+        $files = $this->h5p_fs_fs->get_area_files(
+            $this->h5p_fs_context->id,
+            file_storage::COMPONENT,
+            file_storage::CONTENT_FILEAREA,
+            $targeth5pcontentid,
+            'filepath, filename',
+            false
+        );
+
+        $filepaths = array_map(static function(stored_file $file): string {
+            return $file->get_filepath() . $file->get_filename();
+        }, $files);
 
         // Check that created files match with database records.
-        $this->assertEquals($filesexpected, $filesdb);
+        $this->assertEquals($filesexpected, array_values($filepaths));
     }
 
     /**
diff --git a/lib/classes/task/manager.php b/lib/classes/task/manager.php
index 636d4d0cc7b..765fba2f726 100644
--- a/lib/classes/task/manager.php
+++ b/lib/classes/task/manager.php
@@ -986,7 +986,7 @@ class manager {
         $params = ['now1' => time(), 'now2' => time()];
 
         $sql = "SELECT subquery.*
-                  FROM (SELECT concat('s', ts.id) as uniqueid,
+                  FROM (SELECT " . $DB->sql_concat("'s'", 'ts.id') . " as uniqueid,
                                ts.id,
                                'scheduled' as type,
                                ts.classname,
@@ -997,7 +997,7 @@ class manager {
                           FROM {task_scheduled} ts
                          WHERE ts.timestarted IS NOT NULL
                          UNION ALL
-                        SELECT concat('a', ta.id) as uniqueid,
+                        SELECT " . $DB->sql_concat("'a'", 'ta.id') . " as uniqueid,
                                ta.id,
                                'adhoc' as type,
                                ta.classname,