diff --git a/panels_ipe/tests/src/FunctionalJavascript/PanelsIPETestBase.php b/panels_ipe/tests/src/FunctionalJavascript/PanelsIPETestBase.php
index 9a67f9b..d0ab4c5 100644
--- a/panels_ipe/tests/src/FunctionalJavascript/PanelsIPETestBase.php
+++ b/panels_ipe/tests/src/FunctionalJavascript/PanelsIPETestBase.php
@@ -2,12 +2,12 @@
 
 namespace Drupal\Tests\panels_ipe\FunctionalJavascript;
 
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 
 /**
  * Base class which runs through standard Panels IPE test routines.
  */
-abstract class PanelsIPETestBase extends JavascriptTestBase {
+abstract class PanelsIPETestBase extends WebDriverTestBase {
 
   use PanelsIPETestTrait;
 
diff --git a/tests/src/Unit/panels_ipe/RemoveBlockRequestHandlerTest.php b/panels_ipe/tests/src/Unit/RemoveBlockRequestHandlerTest.php
similarity index 96%
rename from tests/src/Unit/panels_ipe/RemoveBlockRequestHandlerTest.php
rename to panels_ipe/tests/src/Unit/RemoveBlockRequestHandlerTest.php
index 9eda8c7..8d8e966 100644
--- a/tests/src/Unit/panels_ipe/RemoveBlockRequestHandlerTest.php
+++ b/panels_ipe/tests/src/Unit/RemoveBlockRequestHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\panels\Unit\panels_ipe;
+namespace Drupal\Tests\panels_ipe\Unit;
 
 use Drupal\panels_ipe\Helpers\RemoveBlockRequestHandler;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/tests/src/Unit/panels_ipe/RequestHandlerTestBase.php b/panels_ipe/tests/src/Unit/RequestHandlerTestBase.php
similarity index 93%
rename from tests/src/Unit/panels_ipe/RequestHandlerTestBase.php
rename to panels_ipe/tests/src/Unit/RequestHandlerTestBase.php
index d570c49..09fc8d3 100644
--- a/tests/src/Unit/panels_ipe/RequestHandlerTestBase.php
+++ b/panels_ipe/tests/src/Unit/RequestHandlerTestBase.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\Tests\panels\Unit\panels_ipe;
-
+namespace Drupal\Tests\panels_ipe\Unit;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\panels\Plugin\DisplayVariant\PanelsDisplayVariant;
 use Drupal\panels\Storage\PanelsStorageManagerInterface;
 use Drupal\Core\TempStore\SharedTempStore;
+use Drupal\Tests\UnitTestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\Request;
 /**
  * Base tests for IPE request handler classes.
  */
-abstract class RequestHandlerTestBase extends \PHPUnit_Framework_TestCase {
+abstract class RequestHandlerTestBase extends UnitTestCase {
 
   /**
    * @var  \Drupal\panels_ipe\Helpers\RequestHandlerInterface */
diff --git a/tests/src/Unit/panels_ipe/UpdateLayoutRequestHandlerTest.php b/panels_ipe/tests/src/Unit/UpdateLayoutRequestHandlerTest.php
similarity index 98%
rename from tests/src/Unit/panels_ipe/UpdateLayoutRequestHandlerTest.php
rename to panels_ipe/tests/src/Unit/UpdateLayoutRequestHandlerTest.php
index a068468..499a75d 100644
--- a/tests/src/Unit/panels_ipe/UpdateLayoutRequestHandlerTest.php
+++ b/panels_ipe/tests/src/Unit/UpdateLayoutRequestHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\panels\Unit\panels_ipe;
+namespace Drupal\Tests\panels_ipe\Unit;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Block\BlockBase;
diff --git a/src/Tests/PageManagerPanelsStorageIntegrationTest.php b/tests/src/Functional/PageManagerPanelsStorageIntegrationTest.php
similarity index 89%
rename from src/Tests/PageManagerPanelsStorageIntegrationTest.php
rename to tests/src/Functional/PageManagerPanelsStorageIntegrationTest.php
index d4014f3..418cade 100644
--- a/src/Tests/PageManagerPanelsStorageIntegrationTest.php
+++ b/tests/src/Functional/PageManagerPanelsStorageIntegrationTest.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Drupal\panels\Tests;
+namespace Drupal\Tests\panels\Functional;
 
 use Drupal\page_manager\Entity\PageVariant;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests integration between Page Manager and Panels Storage.
  *
  * @group panels
  */
-class PageManagerPanelsStorageIntegrationTest extends WebTestBase {
+class PageManagerPanelsStorageIntegrationTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['block', 'page_manager', 'page_manager_ui', 'panels_test', 'panels_ipe'];
+  protected static $modules = ['block', 'page_manager', 'page_manager_ui', 'panels_test', 'panels_ipe'];
 
   /**
    * {@inheritdoc}
diff --git a/src/Tests/PanelsConfigSchemaTest.php b/tests/src/Functional/PanelsConfigSchemaTest.php
similarity index 83%
rename from src/Tests/PanelsConfigSchemaTest.php
rename to tests/src/Functional/PanelsConfigSchemaTest.php
index 980e9aa..72b84ec 100644
--- a/src/Tests/PanelsConfigSchemaTest.php
+++ b/tests/src/Functional/PanelsConfigSchemaTest.php
@@ -1,21 +1,20 @@
 <?php
 
-namespace Drupal\panels\Tests;
+namespace Drupal\Tests\panels\Functional;
 
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests validating config in the Panels display manager.
  *
  * @group panels
  */
-class PanelsConfigSchemaTest extends WebTestBase {
+class PanelsConfigSchemaTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['panels', 'block', 'node', 'user'];
+  protected static $modules = ['panels', 'block', 'node', 'user'];
 
   /**
    * @var \Drupal\panels\PanelsDisplayManagerInterface
diff --git a/src/Tests/PanelsTest.php b/tests/src/Functional/PanelsTest.php
similarity index 94%
rename from src/Tests/PanelsTest.php
rename to tests/src/Functional/PanelsTest.php
index 603bd73..ca54dbe 100644
--- a/src/Tests/PanelsTest.php
+++ b/tests/src/Functional/PanelsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\panels\Tests;
+namespace Drupal\Tests\panels\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -10,7 +10,7 @@ use Drupal\user\Entity\User;
  *
  * @group panels
  */
-class PanelsTest extends WebTestBase {
+class PanelsTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
@@ -20,7 +20,7 @@ class PanelsTest extends WebTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['block', 'page_manager', 'page_manager_ui', 'panels_test'];
+  protected static $modules = ['block', 'page_manager', 'page_manager_ui', 'panels_test'];
 
   /**
    * {@inheritdoc}