diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 814757b..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * PHPUnit bootstrap file
- *
- * @package WPALLSTARS\PluginStarterTemplate
- */
-
-// First, we need to load the composer autoloader so we can use WP Mock.
-require_once dirname(__DIR__) . '/vendor/autoload.php';
-
-// No need to import WP_Mock classes here
-
-// Now call the bootstrap method of WP Mock.
-WP_Mock::bootstrap();
-
-/**
- * Now we define a few constants to help us with testing.
- */
-define('WPST_PLUGIN_DIR', dirname(__DIR__) . '/');
-define('WPST_PLUGIN_URL', 'http://example.org/wp-content/plugins/wp-plugin-starter-template/');
-define('WPST_VERSION', '0.1.0');
-
-/**
- * Now we include any plugin files that we need to be able to run the tests.
- * This should be files that define the functions and classes you're going to test.
- */
-require_once WPST_PLUGIN_DIR . 'includes/class-core.php';
-require_once WPST_PLUGIN_DIR . 'includes/class-plugin.php';
-require_once WPST_PLUGIN_DIR . 'admin/lib/admin.php';
diff --git a/tests/test-admin.php b/tests/phpunit/test-admin.php
similarity index 100%
rename from tests/test-admin.php
rename to tests/phpunit/test-admin.php
diff --git a/tests/test-core.php b/tests/phpunit/test-core.php
similarity index 100%
rename from tests/test-core.php
rename to tests/phpunit/test-core.php