diff --git a/tests/src/ConfigDevelAutoExportSubscriberTest.php b/tests/src/ConfigDevelAutoExportSubscriberTest.php
index 864f7c5..d7b3112 100644
--- a/tests/src/ConfigDevelAutoExportSubscriberTest.php
+++ b/tests/src/ConfigDevelAutoExportSubscriberTest.php
@@ -43,7 +43,7 @@ class ConfigDevelAutoExportSubscriberTest extends ConfigDevelTestBase {
       vfsStream::url('public://' . $this->randomMachineName() . '.yml'),
     );
 
-    $configDevelSubscriber = new ConfigDevelAutoExportSubscriber($this->configFactory, $this->configManager);
+    $configDevelSubscriber = new ConfigDevelAutoExportSubscriber($this->configFactory, $this->configManager, $this->eventDispatcher);
     $configDevelSubscriber->writeBackConfig($config, $file_names);
 
     $data = $config_data;
diff --git a/tests/src/ConfigDevelTestBase.php b/tests/src/ConfigDevelTestBase.php
index 245dce7..194fe63 100644
--- a/tests/src/ConfigDevelTestBase.php
+++ b/tests/src/ConfigDevelTestBase.php
@@ -26,12 +26,19 @@ abstract class ConfigDevelTestBase extends UnitTestCase {
   protected $configManager;
 
   /**
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
+   */
+  protected $eventDispatcher;
+
+  /**
    * {@inheritdoc}
    */
   public function setUp() {
     parent::setUp();
     $this->configFactory = $this->getMock('Drupal\Core\Config\ConfigFactoryInterface');
 
+    $this->eventDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+
     $this->configManager = $this->getMock('Drupal\Core\Config\ConfigManagerInterface');
     $this->configManager->expects($this->any())
       ->method('getEntityTypeIdByName')
diff --git a/src/Tests/ConfigDevelSubscriberEntityTest.php b/tests/src/Kernel/ConfigDevelSubscriberEntityTest.php
similarity index 85%
rename from src/Tests/ConfigDevelSubscriberEntityTest.php
rename to tests/src/Kernel/ConfigDevelSubscriberEntityTest.php
index 443dc36..96a7dab 100644
--- a/src/Tests/ConfigDevelSubscriberEntityTest.php
+++ b/tests/src/Kernel/ConfigDevelSubscriberEntityTest.php
@@ -1,12 +1,6 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\config_devel\Tests\ConfigDevelSubscriberEntityTest.
- */
-
-
-namespace Drupal\config_devel\Tests;
+namespace Drupal\Tests\config_devel\Kernel;
 
 /**
  * Tests the automated importer for config entities.
diff --git a/src/Tests/ConfigDevelSubscriberRawTest.php b/tests/src/Kernel/ConfigDevelSubscriberRawTest.php
similarity index 79%
rename from src/Tests/ConfigDevelSubscriberRawTest.php
rename to tests/src/Kernel/ConfigDevelSubscriberRawTest.php
index 93f27c9..340eca6 100644
--- a/src/Tests/ConfigDevelSubscriberRawTest.php
+++ b/tests/src/Kernel/ConfigDevelSubscriberRawTest.php
@@ -1,11 +1,6 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\config_devel\Tests\ConfigDevelSubscriberRawTest.
- */
-
-namespace Drupal\config_devel\Tests;
+namespace Drupal\Tests\config_devel\Kernel;
 
 /**
  * Tests the automated importer for raw config objects.
diff --git a/src/Tests/ConfigDevelSubscriberTestBase.php b/tests/src/Kernel/ConfigDevelSubscriberTestBase.php
similarity index 74%
rename from src/Tests/ConfigDevelSubscriberTestBase.php
rename to tests/src/Kernel/ConfigDevelSubscriberTestBase.php
index 260a776..905912d 100644
--- a/src/Tests/ConfigDevelSubscriberTestBase.php
+++ b/tests/src/Kernel/ConfigDevelSubscriberTestBase.php
@@ -1,15 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\config_devel\Tests\ConfigDevelAutoImportSubscriberTestBase.
- */
-
-namespace Drupal\config_devel\Tests;
+namespace Drupal\Tests\config_devel\Kernel;
 
 use Drupal\Component\Serialization\Yaml;
-use Drupal\simpletest\KernelTestBase;
-use org\bovigo\vfs\vfsStream;
+use Drupal\KernelTests\KernelTestBase;
 
 abstract class ConfigDevelSubscriberTestBase extends KernelTestBase {
 
@@ -29,22 +23,14 @@ abstract class ConfigDevelSubscriberTestBase extends KernelTestBase {
   protected $storage;
 
   /**
-   * set up test environment
-   */
-  public function setUp() {
-    vfsStream::setup('public://');
-    parent::setUp();
-  }
-
-  /**
    * Test the import subscriber.
    */
   public function testSubscribers() {
     // Without this the config exporter breaks.
     \Drupal::service('config.installer')->installDefaultConfig('module', 'config_devel');
-    $filename = vfsStream::url('public://'. static::CONFIGNAME . '.yml');
-    drupal_mkdir(vfsStream::url('public://exported'));
-    $exported_filename = vfsStream::url('public://exported/' . static::CONFIGNAME . '.yml');
+    $filename = 'public://'. static::CONFIGNAME . '.yml';
+    drupal_mkdir('public://exported');
+    $exported_filename = 'public://exported/' . static::CONFIGNAME . '.yml';
     \Drupal::configFactory()->getEditable('config_devel.settings')
       ->set('auto_import', array(array(
         'filename' => $filename,