diff --git a/media_entity_browser.info.yml b/media_entity_browser.info.yml
index 157692e..0d977f6 100644
--- a/media_entity_browser.info.yml
+++ b/media_entity_browser.info.yml
@@ -5,15 +5,15 @@ package: Media
 core: '8.x'
 
 dependencies:
-  - entity_browser
-  - media
-  - views
+  - entity_browser:entity_browser
+  - drupal:media
+  - drupal:views
 
 test_dependencies:
-  - entity_browser
-  - media
-  - video_embed_field
-  - ctools
+  - entity_browser (>=8.x-2.x)
+  - drupal:media (>=8.4)
+  - video_embed_field (>=8.x-2.x)
+  - ctools:ctools
 
 # To export this config, make sure config_devel is installed, cache is rebuilt
 # then run "drush config-devel-export media_entity_browser".
diff --git a/tests/src/FunctionalJavascript/MediaEntityBrowserTest.php b/tests/src/FunctionalJavascript/MediaEntityBrowserTest.php
index 19adc3a..a950b8a 100644
--- a/tests/src/FunctionalJavascript/MediaEntityBrowserTest.php
+++ b/tests/src/FunctionalJavascript/MediaEntityBrowserTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\media_entity_browser\FunctionalJavascript;
 use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
 use Drupal\media\Entity\Media;
 use Drupal\media\Entity\MediaType;
+use Drupal\Tests\media\Functional\MediaFunctionalTestCreateMediaTypeTrait;
 
 /**
  * A test for the media entity browser.
@@ -13,6 +14,7 @@ use Drupal\media\Entity\MediaType;
  */
 class MediaEntityBrowserTest extends JavascriptTestBase {
 
+  use MediaFunctionalTestCreateMediaTypeTrait;
   /**
    * Modules to install.
    *
@@ -32,12 +34,11 @@ class MediaEntityBrowserTest extends JavascriptTestBase {
   public function setUp() {
     parent::setUp();
     $this->drupalLogin($this->drupalCreateUser(array_keys($this->container->get('user.permissions')->getPermissions())));
-    MediaType::create([
+    $this->createMediaType([
       'label' => 'Video',
-      'id' => 'video',
-      'description' => 'Video bundle.',
-      'type' => 'video_embed_field',
-    ])->save();
+      'bundle' => 'video',
+    ], 'video_embed_field');
+
     Media::create([
       'bundle' => 'video',
       'field_media_video_embed_field' => [['value' => 'https://www.youtube.com/watch?v=XgYu7-DQjDQ']],