diff --git a/composer.json b/composer.json
index 5b87a34f64d43518fd1b765d7662b949bf28962b..afcefc8f492e3cea96320435604b897bd0aeb80d 100644
--- a/composer.json
+++ b/composer.json
@@ -10,5 +10,9 @@
     "issues": "https://www.drupal.org/project/issues/migrate_source_ui",
     "source": "http://cgit.drupalcode.org/migrate_source_ui"
   },
-  "require": { }
+  "require": { },
+  "suggest": {
+      "drupal/migrate_plus": "Provides JSON and XML sources",
+      "drupal/migrate_source_csv": "Provides CSV source"
+  }
 }
diff --git a/migrate_source_ui.info.yml b/migrate_source_ui.info.yml
index c522270e6ad4906875520c94c28352c87449bf72..83014d2f9472c65825b080a3479fa4601f6807d2 100644
--- a/migrate_source_ui.info.yml
+++ b/migrate_source_ui.info.yml
@@ -2,10 +2,9 @@ name: Migrate Source UI
 type: module
 description: UI for CSV, XML or JSON sources.
 core: 8.x
+core_version_requirement: ^8 || ^9
 package: Migrate
 configure: migrate_source_ui.form
 
 dependencies:
   - drupal:migrate
-  - drupal:migrate_plus
-  - drupal:migrate_source_csv
diff --git a/src/Form/MigrateSourceUiForm.php b/src/Form/MigrateSourceUiForm.php
index ae8e245efcc3f14dadc49dfbbac63005ce21c291..1111b89ea78b630ee14872087bfba88311b8b5d7 100644
--- a/src/Form/MigrateSourceUiForm.php
+++ b/src/Form/MigrateSourceUiForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\migrate_source_ui\Form;
 
+use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\migrate\Plugin\Migration;
@@ -71,7 +72,7 @@ class MigrateSourceUiForm extends FormBase {
       if ($migrationInstance->getSourcePlugin() instanceof CSV || $migrationInstance->getSourcePlugin() instanceof Json || $migrationInstance->getSourcePlugin() instanceof Xml) {
         $id = $definition['id'];
         $options[$id] = $this->t('%id (supports %file_type)', [
-          '%id' => isset($definition['label']) ? $definition['label'] : $id,
+          '%id' => $definition['label'] ?? $id,
           '%file_type' => $this->getFileExtensionSupported($migrationInstance),
         ]);
       }
@@ -109,7 +110,7 @@ class MigrateSourceUiForm extends FormBase {
     $extension = $this->getFileExtensionSupported($migrationInstance);
 
     $validators = ['file_validate_extensions' => [$extension]];
-    $file = file_save_upload('source_file', $validators, FALSE, 0, FILE_EXISTS_REPLACE);
+    $file = file_save_upload('source_file', $validators, FALSE, 0, FileSystemInterface::EXISTS_REPLACE);
 
     if (isset($file)) {
       // File upload was attempted.
@@ -136,9 +137,9 @@ class MigrateSourceUiForm extends FormBase {
 
     // Reset status.
     $status = $migration->getStatus();
-    if ($status != MigrationInterface::STATUS_IDLE) {
+    if ($status !== MigrationInterface::STATUS_IDLE) {
       $migration->setStatus(MigrationInterface::STATUS_IDLE);
-      drupal_set_message($this->t('Migration @id reset to Idle', ['@id' => $migration_id]), 'warning');
+      $this->messenger()->addWarning($this->t('Migration @id reset to Idle', ['@id' => $migration_id]));
     }
 
     $options = [
diff --git a/tests/src/Functional/LoadTest.php b/tests/src/Functional/LoadTest.php
index 714ffafce0a175191b0b532338f37dab6076aa8b..254c3916f90c257b691e30dfca07a12c1f8fed5b 100644
--- a/tests/src/Functional/LoadTest.php
+++ b/tests/src/Functional/LoadTest.php
@@ -12,6 +12,11 @@ use Drupal\Tests\BrowserTestBase;
  */
 class LoadTest extends BrowserTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * Modules to enable.
    *