diff --git a/create_user_permission.info.yml b/create_user_permission.info.yml
index 306411e7b5130a3b8852d0d47801b050d1908e6f..e5087dac5ecb1d67a736ea775a162c8928fd1245 100644
--- a/create_user_permission.info.yml
+++ b/create_user_permission.info.yml
@@ -1,4 +1,5 @@
 name: Create user permission
 description: Provides a permission to "create users", instead of having to "administer users"
 core: 8.x
+core_version_requirement: '^8 || ^9'
 type: module
diff --git a/tests/src/FunctionalJavascript/PermissionTest.php b/tests/src/Functional/PermissionTest.php
similarity index 76%
rename from tests/src/FunctionalJavascript/PermissionTest.php
rename to tests/src/Functional/PermissionTest.php
index ba1e323caae9aaa2208597feaafaa02541be79cf..126d848f106e5576b07f8a40cdf52952466ac06a 100644
--- a/tests/src/FunctionalJavascript/PermissionTest.php
+++ b/tests/src/Functional/PermissionTest.php
@@ -1,17 +1,25 @@
 <?php
 
-namespace Drupal\Tests\create_user_permission\FunctionalJavascript;
+namespace Drupal\Tests\create_user_permission\Functional;
 
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the JavaScript functionality of the Create user permission module.
  *
  * @group create_user_permission
  */
-class PermissionTest extends JavascriptTestBase {
+class PermissionTest extends BrowserTestBase {
 
-  public static $modules = [
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
     'create_user_permission',
   ];
 
diff --git a/tests/src/FunctionalJavascript/RegistrationTest.php b/tests/src/Functional/RegistrationTest.php
similarity index 100%
rename from tests/src/FunctionalJavascript/RegistrationTest.php
rename to tests/src/Functional/RegistrationTest.php
diff --git a/tests/src/Functional/UserNotBlockedTest.php b/tests/src/Functional/UserNotBlockedTest.php
index b0665e89dd93dd314c82886e569c65cd2b94a96b..8f7bdcfd28365b34ebd0777afea1e9fbd3ebdb6b 100644
--- a/tests/src/Functional/UserNotBlockedTest.php
+++ b/tests/src/Functional/UserNotBlockedTest.php
@@ -14,7 +14,12 @@ class UserNotBlockedTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['create_user_permission'];
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['create_user_permission'];
 
   /**
    * Test that users created are not blocked.
diff --git a/tests/src/FunctionalJavascript/CanNotifyTest.php b/tests/src/FunctionalJavascript/CanNotifyTest.php
index 38850ad18fb6297cfb6ccffaeb6ee2c2d74d53e8..d210c04171d75a4d9e1fad4cdf1526753c3c3a12 100644
--- a/tests/src/FunctionalJavascript/CanNotifyTest.php
+++ b/tests/src/FunctionalJavascript/CanNotifyTest.php
@@ -1,20 +1,25 @@
 <?php
 
-namespace Drupal\Tests\create_user_permission\FunctionalJavascript;
+namespace Drupal\Tests\create_user_permission\Functional;
 
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 
 /**
  * Test that "create users" able users can notify users about the new account.
  *
  * @group create_user_permission
  */
-class CanNotifyTest extends JavascriptTestBase {
+class CanNotifyTest extends WebDriverTestBase {
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['create_user_permission'];
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['create_user_permission'];
 
   /**
    * Test that we can check the "notify user" checkbox.