diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php
index 66f88f7..d72f539 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php
@@ -16,6 +16,7 @@
  * @see \Drupal\contact\Plugin\views\field\ContactLink.
  */
 class ContactLinkTest extends ViewTestBase {
+
   /**
    * Stores the user data service used by the test.
    *
@@ -41,7 +42,7 @@ public static function getInfo() {
     return array(
       'name' => 'Contact: Link Field',
       'description' => 'Tests the contact link field.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
@@ -50,7 +51,7 @@ protected function setUp() {
 
     ViewTestData::importTestViews(get_class($this), array('contact_test_views'));
 
-    $this->userData = drupal_container()->get('user.data');
+    $this->userData = $this->container->get('user.data');
   }
 
 
diff --git a/core/modules/contact/tests/modules/contact_test_views/contact_test_views.info.yml b/core/modules/contact/tests/modules/contact_test_views/contact_test_views.info.yml
index ceb41fc..a3f7c4e 100644
--- a/core/modules/contact/tests/modules/contact_test_views/contact_test_views.info.yml
+++ b/core/modules/contact/tests/modules/contact_test_views/contact_test_views.info.yml
@@ -1,8 +1,9 @@
-name = Contact test views
-description = Provides default views for views contact tests.
-package = Testing
-version = VERSION
-core = 8.x
-dependencies[] = contact
-dependencies[] = views
-hidden = TRUE
+name: 'Contact test views'
+description: 'Provides default views for views contact tests.'
+package: Testing
+version: VERSION
+core: '8.x;'
+dependencies:
+  - contact
+  - views
+hidden: true