diff --git a/tests/modules/tdd_dublin_test/config/optional/node.type.article.yml b/tests/modules/tdd_dublin_test/config/optional/node.type.article.yml
deleted file mode 100644
index 1fd439c..0000000
--- a/tests/modules/tdd_dublin_test/config/optional/node.type.article.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-name: Article
-type: article
-description: 'Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.'
-help: ''
-new_revision: true
-preview_mode: 1
-display_submitted: true
diff --git a/tests/modules/tdd_dublin_test/config/optional/node.type.page.yml b/tests/modules/tdd_dublin_test/config/optional/node.type.page.yml
deleted file mode 100644
index a6ddd46..0000000
--- a/tests/modules/tdd_dublin_test/config/optional/node.type.page.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: KuyA4NHPXcmKAjRtwa0vQc2ZcyrUJy6IlS2TAyMNRbc
-name: 'Basic page'
-type: page
-description: 'Use <em>basic pages</em> for your static content, such as an ''About us'' page.'
-help: ''
-new_revision: true
-preview_mode: 1
-display_submitted: false
diff --git a/tests/modules/tdd_dublin_test/tdd_dublin_test.info.yml b/tests/modules/tdd_dublin_test/tdd_dublin_test.info.yml
deleted file mode 100644
index 1725970..0000000
--- a/tests/modules/tdd_dublin_test/tdd_dublin_test.info.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: TDD Dublin Test
-type: module
-core: 8.x
-dependencies:
-  - tdd_dublin:tdd_dublin
-hidden: true
diff --git a/tests/src/Kernel/PageListTest.php b/tests/src/Kernel/PageListTest.php
index 8d59299..ab5f929 100644
--- a/tests/src/Kernel/PageListTest.php
+++ b/tests/src/Kernel/PageListTest.php
@@ -2,24 +2,21 @@
 
 namespace Drupal\Tests\tdd_dublin\Kernel;
 
-use Drupal\KernelTests\KernelTestBase;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\views\ResultRow;
 
 /**
  * @group tdd_dublin
  */
-class PageListTest extends KernelTestBase {
+class PageListTest extends EntityKernelTestBase {
 
   /**
    * {@inheritdoc}
    */
-  protected static $modules = [
+  public static $modules = [
     'node',
-    'system',
     'tdd_dublin',
-    'tdd_dublin_test',
-    'user',
     'views',
   ];