diff --git a/tests/TestCase/Auth/BasicAuthenticateTest.php b/tests/TestCase/Auth/BasicAuthenticateTest.php
index e080c1e80f7..072618a20e9 100644
--- a/tests/TestCase/Auth/BasicAuthenticateTest.php
+++ b/tests/TestCase/Auth/BasicAuthenticateTest.php
@@ -34,7 +34,7 @@ class BasicAuthenticateTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.user', 'core.auth_user');
+	public $fixtures = array('core.users', 'core.auth_users');
 
 /**
  * setup
diff --git a/tests/TestCase/Auth/DigestAuthenticateTest.php b/tests/TestCase/Auth/DigestAuthenticateTest.php
index 9922dd170a9..f89877fd8f7 100644
--- a/tests/TestCase/Auth/DigestAuthenticateTest.php
+++ b/tests/TestCase/Auth/DigestAuthenticateTest.php
@@ -35,7 +35,7 @@ class DigestAuthenticateTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.user', 'core.auth_user');
+	public $fixtures = array('core.users', 'core.auth_users');
 
 /**
  * setup
diff --git a/tests/TestCase/Auth/FormAuthenticateTest.php b/tests/TestCase/Auth/FormAuthenticateTest.php
index adf285e7296..806a3ddbd20 100644
--- a/tests/TestCase/Auth/FormAuthenticateTest.php
+++ b/tests/TestCase/Auth/FormAuthenticateTest.php
@@ -37,7 +37,7 @@ class FormAuthenticateTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.user', 'core.auth_user'];
+	public $fixtures = ['core.users', 'core.auth_users'];
 
 /**
  * setup
diff --git a/tests/TestCase/Console/ShellTest.php b/tests/TestCase/Console/ShellTest.php
index b79ba4fc1fb..bf04d591d8f 100644
--- a/tests/TestCase/Console/ShellTest.php
+++ b/tests/TestCase/Console/ShellTest.php
@@ -121,10 +121,15 @@ class ShellTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array(
-		'core.post', 'core.comment', 'core.article', 'core.user',
-		'core.tag', 'core.articles_tag', 'core.attachment'
-	);
+	public $fixtures = [
+		'core.posts',
+		'core.comments',
+		'core.articles',
+		'core.users',
+		'core.tags',
+		'core.articles_tags',
+		'core.attachments'
+	];
 
 /**
  * setUp method
diff --git a/tests/TestCase/Controller/Component/AuthComponentTest.php b/tests/TestCase/Controller/Component/AuthComponentTest.php
index d17c1316906..63d4b256099 100644
--- a/tests/TestCase/Controller/Component/AuthComponentTest.php
+++ b/tests/TestCase/Controller/Component/AuthComponentTest.php
@@ -51,7 +51,7 @@ class AuthComponentTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.user', 'core.auth_user'];
+	public $fixtures = ['core.users', 'core.auth_users'];
 
 /**
  * setUp method
diff --git a/tests/TestCase/Controller/Component/PaginatorComponentTest.php b/tests/TestCase/Controller/Component/PaginatorComponentTest.php
index 08c1fa8605c..5e305d31065 100644
--- a/tests/TestCase/Controller/Component/PaginatorComponentTest.php
+++ b/tests/TestCase/Controller/Component/PaginatorComponentTest.php
@@ -46,7 +46,7 @@ class PaginatorComponentTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.post');
+	public $fixtures = array('core.posts');
 
 /**
  * Don't load data for fixtures for all tests
@@ -147,7 +147,7 @@ public function testPaginateExtraParams() {
  * @return void
  */
 	public function testPaginateCustomFinderOptions() {
-		$this->loadFixtures('Post');
+		$this->loadFixtures('Posts');
 		$settings = [
 			'PaginatorPosts' => [
 				'finder' => ['author' => ['author_id' => 1]]
@@ -469,7 +469,7 @@ public function testValidateSortInvalidDirection() {
  * @return void
  */
 	public function testOutOfRangePageNumberGetsClamped() {
-		$this->loadFixtures('Post');
+		$this->loadFixtures('Posts');
 		$this->request->query['page'] = 3000;
 
 		$table = TableRegistry::get('PaginatorPosts');
@@ -492,7 +492,7 @@ public function testOutOfRangePageNumberGetsClamped() {
  * @return void
  */
 	public function testOutOfVeryBigPageNumberGetsClamped() {
-		$this->loadFixtures('Post');
+		$this->loadFixtures('Posts');
 		$this->request->query = [
 			'page' => '3000000000000000000000000',
 		];
@@ -660,7 +660,7 @@ public function testCheckLimit() {
  * @return void
  */
 	public function testPaginateMaxLimit() {
-		$this->loadFixtures('Post');
+		$this->loadFixtures('Posts');
 		$table = TableRegistry::get('PaginatorPosts');
 
 		$settings = [
@@ -687,7 +687,7 @@ public function testPaginateMaxLimit() {
  * @return void
  */
 	public function testPaginateCustomFind() {
-		$this->loadFixtures('Post');
+		$this->loadFixtures('Posts');
 		$idExtractor = function ($result) {
 			$ids = [];
 			foreach ($result as $record) {
@@ -740,7 +740,7 @@ public function testPaginateCustomFind() {
  * @return void
  */
 	public function testPaginateCustomFindOldOption() {
-		$this->loadFixtures('Post');
+		$this->loadFixtures('Posts');
 		$table = TableRegistry::get('PaginatorPosts');
 		$this->Paginator->paginate($table, ['findType' => 'published']);
 	}
@@ -751,7 +751,7 @@ public function testPaginateCustomFindOldOption() {
  * @return void
  */
 	public function testPaginateCustomFindFieldsArray() {
-		$this->loadFixtures('Post');
+		$this->loadFixtures('Posts');
 		$table = TableRegistry::get('PaginatorPosts');
 		$data = array('author_id' => 3, 'title' => 'Fourth Article', 'body' => 'Article Body, unpublished', 'published' => 'N');
 		$table->save(new \Cake\ORM\Entity($data));
diff --git a/tests/TestCase/Controller/Component/SessionComponentTest.php b/tests/TestCase/Controller/Component/SessionComponentTest.php
index 1b37c5d8581..d4cbb9bfdd2 100644
--- a/tests/TestCase/Controller/Component/SessionComponentTest.php
+++ b/tests/TestCase/Controller/Component/SessionComponentTest.php
@@ -37,7 +37,7 @@ class SessionComponentTest extends TestCase {
  *
  * @var string
  */
-	public $fixtures = array('core.session');
+	public $fixtures = array('core.sessions');
 
 /**
  * test case startup
diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
index 8259bd7dc53..c4608aa8a16 100644
--- a/tests/TestCase/Controller/ControllerTest.php
+++ b/tests/TestCase/Controller/ControllerTest.php
@@ -206,8 +206,8 @@ class ControllerTest extends TestCase {
  * @var array
  */
 	public $fixtures = array(
-		'core.post',
-		'core.comment'
+		'core.posts',
+		'core.comments'
 	);
 
 /**
diff --git a/tests/TestCase/Database/ConnectionTest.php b/tests/TestCase/Database/ConnectionTest.php
index 197b69b473d..5f6b6671eb2 100644
--- a/tests/TestCase/Database/ConnectionTest.php
+++ b/tests/TestCase/Database/ConnectionTest.php
@@ -24,7 +24,7 @@
  */
 class ConnectionTest extends TestCase {
 
-	public $fixtures = ['core.thing'];
+	public $fixtures = ['core.things'];
 
 	public function setUp() {
 		$this->connection = ConnectionManager::get('test');
diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
index 31d113f050f..359221ead29 100644
--- a/tests/TestCase/Database/QueryTest.php
+++ b/tests/TestCase/Database/QueryTest.php
@@ -26,7 +26,7 @@
  */
 class QueryTest extends TestCase {
 
-	public $fixtures = ['core.article', 'core.author', 'core.comment'];
+	public $fixtures = ['core.articles', 'core.authors', 'core.comments'];
 
 	const ARTICLE_COUNT = 3;
 	const AUTHOR_COUNT = 4;
diff --git a/tests/TestCase/Database/Schema/CollectionTest.php b/tests/TestCase/Database/Schema/CollectionTest.php
index 904748d6cb3..f1d00f3bb51 100644
--- a/tests/TestCase/Database/Schema/CollectionTest.php
+++ b/tests/TestCase/Database/Schema/CollectionTest.php
@@ -28,7 +28,7 @@
 class CollectionTest extends TestCase {
 
 	public $fixtures = [
-		'core.user'
+		'core.users'
 	];
 
 /**
diff --git a/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php b/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php
index cd1c4df8a7d..918b4a62b1c 100644
--- a/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php
+++ b/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php
@@ -45,8 +45,8 @@ class CounterCacheBehaviorTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.counter_cache_user',
-		'core.counter_cache_post'
+		'core.counter_cache_users',
+		'core.counter_cache_posts'
 	];
 
 /**
diff --git a/tests/TestCase/Model/Behavior/TimestampBehaviorTest.php b/tests/TestCase/Model/Behavior/TimestampBehaviorTest.php
index 010528ede28..f46e6f97e28 100644
--- a/tests/TestCase/Model/Behavior/TimestampBehaviorTest.php
+++ b/tests/TestCase/Model/Behavior/TimestampBehaviorTest.php
@@ -41,7 +41,7 @@ class TimestampBehaviorTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.user'
+		'core.users'
 	];
 
 /**
@@ -355,7 +355,7 @@ public function testTouchCustomEvent() {
  * @return void
  */
 	public function testSaveTriggersInsert() {
-		$this->loadFixtures('User');
+		$this->loadFixtures('Users');
 
 		$table = TableRegistry::get('users');
 		$table->addBehavior('Timestamp', [
diff --git a/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php b/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php
index 76139a1644a..ccf69763699 100644
--- a/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php
+++ b/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php
@@ -33,10 +33,10 @@ class TranslateBehaviorTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.translate',
-		'core.article',
-		'core.comment',
-		'core.author'
+		'core.translates',
+		'core.articles',
+		'core.comments',
+		'core.authors'
 	];
 
 	public function tearDown() {
diff --git a/tests/TestCase/Model/Behavior/TreeBehaviorTest.php b/tests/TestCase/Model/Behavior/TreeBehaviorTest.php
index c2b0679e649..963219b81e3 100644
--- a/tests/TestCase/Model/Behavior/TreeBehaviorTest.php
+++ b/tests/TestCase/Model/Behavior/TreeBehaviorTest.php
@@ -32,8 +32,8 @@ class TreeBehaviorTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.number_tree',
-		'core.menu_link_tree'
+		'core.number_trees',
+		'core.menu_link_trees'
 	];
 
 	public function setUp() {
diff --git a/tests/TestCase/Network/Session/DatabaseSessionTest.php b/tests/TestCase/Network/Session/DatabaseSessionTest.php
index b7921a5a4ae..4d58001571e 100644
--- a/tests/TestCase/Network/Session/DatabaseSessionTest.php
+++ b/tests/TestCase/Network/Session/DatabaseSessionTest.php
@@ -35,7 +35,7 @@ class DatabaseSessionTest extends TestCase {
  *
  * @var string
  */
-	public $fixtures = ['core.session'];
+	public $fixtures = ['core.sessions'];
 
 /**
  * setUp
diff --git a/tests/TestCase/Network/SessionTest.php b/tests/TestCase/Network/SessionTest.php
index 38c281fb2a0..1957398a1e0 100644
--- a/tests/TestCase/Network/SessionTest.php
+++ b/tests/TestCase/Network/SessionTest.php
@@ -60,7 +60,7 @@ class SessionTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.session', 'core.cake_session');
+	public $fixtures = array('core.sessions', 'core.cake_sessions');
 
 /**
  * setup before class.
diff --git a/tests/TestCase/ORM/Association/BelongsToTest.php b/tests/TestCase/ORM/Association/BelongsToTest.php
index 596d39e097f..dc902b0299f 100644
--- a/tests/TestCase/ORM/Association/BelongsToTest.php
+++ b/tests/TestCase/ORM/Association/BelongsToTest.php
@@ -34,7 +34,7 @@ class BelongsToTest extends \Cake\TestSuite\TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.article', 'core.comment'];
+	public $fixtures = ['core.articles', 'core.comments'];
 
 /**
  * Don't autoload fixtures as most tests uses mocks.
diff --git a/tests/TestCase/ORM/AssociationProxyTest.php b/tests/TestCase/ORM/AssociationProxyTest.php
index 4286ca40393..9cd935547a9 100644
--- a/tests/TestCase/ORM/AssociationProxyTest.php
+++ b/tests/TestCase/ORM/AssociationProxyTest.php
@@ -32,7 +32,7 @@ class AssociationProxyTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.article', 'core.author', 'core.comment'
+		'core.articles', 'core.authors', 'core.comments'
 	];
 
 /**
diff --git a/tests/TestCase/ORM/CompositeKeysTest.php b/tests/TestCase/ORM/CompositeKeysTest.php
index 7fd15b21722..40b876136db 100644
--- a/tests/TestCase/ORM/CompositeKeysTest.php
+++ b/tests/TestCase/ORM/CompositeKeysTest.php
@@ -44,10 +44,10 @@ class CompositeKeyTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.site_article',
-		'core.site_author',
-		'core.site_tag',
-		'core.site_articles_tag'
+		'core.site_articles',
+		'core.site_authors',
+		'core.site_tags',
+		'core.site_articles_tags'
 	];
 
 /**
diff --git a/tests/TestCase/ORM/MarshallerTest.php b/tests/TestCase/ORM/MarshallerTest.php
index 289caebdc9a..83e6db54927 100644
--- a/tests/TestCase/ORM/MarshallerTest.php
+++ b/tests/TestCase/ORM/MarshallerTest.php
@@ -49,7 +49,7 @@ class ProtectedArticle extends Entity {
  */
 class MarshallerTest extends TestCase {
 
-	public $fixtures = ['core.tag', 'core.articles_tag', 'core.article', 'core.user', 'core.comment'];
+	public $fixtures = ['core.tags', 'core.articles_tags', 'core.articles', 'core.users', 'core.comments'];
 
 /**
  * setup
diff --git a/tests/TestCase/ORM/QueryRegressionTest.php b/tests/TestCase/ORM/QueryRegressionTest.php
index 2336286067d..c8e9384ea6c 100644
--- a/tests/TestCase/ORM/QueryRegressionTest.php
+++ b/tests/TestCase/ORM/QueryRegressionTest.php
@@ -33,14 +33,14 @@ class QueryRegressionTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.user',
-		'core.article',
-		'core.comment',
-		'core.tag',
-		'core.articles_tag',
-		'core.author',
-		'core.special_tag',
-		'core.translate',
+		'core.users',
+		'core.articles',
+		'core.comments',
+		'core.tags',
+		'core.articles_tags',
+		'core.authors',
+		'core.special_tags',
+		'core.translates',
 	];
 
 /**
diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
index 8a90720dac1..0ffe593cb3c 100644
--- a/tests/TestCase/ORM/QueryTest.php
+++ b/tests/TestCase/ORM/QueryTest.php
@@ -35,8 +35,8 @@ class QueryTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.article', 'core.author', 'core.tag',
-		'core.articles_tag', 'core.post'];
+	public $fixtures = ['core.articles', 'core.authors', 'core.tags',
+		'core.articles_tags', 'core.posts'];
 
 /**
  * setUp method
diff --git a/tests/TestCase/ORM/ResultSetTest.php b/tests/TestCase/ORM/ResultSetTest.php
index c4e1179855d..916d434f046 100644
--- a/tests/TestCase/ORM/ResultSetTest.php
+++ b/tests/TestCase/ORM/ResultSetTest.php
@@ -28,7 +28,7 @@
  */
 class ResultSetTest extends TestCase {
 
-	public $fixtures = ['core.article', 'core.comment'];
+	public $fixtures = ['core.articles', 'core.comments'];
 
 /**
  * setup
diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
index 13beca5ce11..d7f52e67c8e 100644
--- a/tests/TestCase/ORM/TableTest.php
+++ b/tests/TestCase/ORM/TableTest.php
@@ -38,8 +38,8 @@ class UsersTable extends Table {
 class TableTest extends \Cake\TestSuite\TestCase {
 
 	public $fixtures = [
-		'core.user', 'core.category', 'core.article', 'core.author',
-		'core.tag', 'core.articles_tag'
+		'core.users', 'core.categories', 'core.articles', 'core.authors',
+		'core.tags', 'core.articles_tags'
 	];
 
 /**
diff --git a/tests/TestCase/ORM/TableUuidTest.php b/tests/TestCase/ORM/TableUuidTest.php
index 6977a0c02ca..d667b47657d 100644
--- a/tests/TestCase/ORM/TableUuidTest.php
+++ b/tests/TestCase/ORM/TableUuidTest.php
@@ -34,7 +34,7 @@ class TableUuidTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.uuiditem', 'core.uuidportfolio'
+		'core.uuiditems', 'core.uuidportfolios'
 	];
 
 /**
diff --git a/tests/TestCase/ORM/ValidationIntegrationTest.php b/tests/TestCase/ORM/ValidationIntegrationTest.php
index 1bf248b969a..ba19fb9ace0 100644
--- a/tests/TestCase/ORM/ValidationIntegrationTest.php
+++ b/tests/TestCase/ORM/ValidationIntegrationTest.php
@@ -28,7 +28,7 @@ class ValidationIntegrationTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.article'];
+	public $fixtures = ['core.articles'];
 
 /**
  * Tear down
diff --git a/tests/TestCase/Routing/RequestActionTraitTest.php b/tests/TestCase/Routing/RequestActionTraitTest.php
index 655017d36fc..ce3a38a5120 100644
--- a/tests/TestCase/Routing/RequestActionTraitTest.php
+++ b/tests/TestCase/Routing/RequestActionTraitTest.php
@@ -31,7 +31,7 @@ class RequestActionTraitTest extends TestCase {
  *
  * @var string
  */
-	public $fixtures = array('core.post', 'core.test_plugin_comment', 'core.comment');
+	public $fixtures = array('core.posts', 'core.test_plugin_comments', 'core.comments');
 
 /**
  * Setup
diff --git a/tests/TestCase/Shell/BakeShellTest.php b/tests/TestCase/Shell/BakeShellTest.php
index a73701ac806..1efe3a5d1c4 100644
--- a/tests/TestCase/Shell/BakeShellTest.php
+++ b/tests/TestCase/Shell/BakeShellTest.php
@@ -28,7 +28,7 @@ class BakeShellTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.comment');
+	public $fixtures = array('core.comments');
 
 /**
  * setup test
diff --git a/tests/TestCase/Shell/OrmCacheShellTest.php b/tests/TestCase/Shell/OrmCacheShellTest.php
index 4ec52c5da2a..cab256d3057 100644
--- a/tests/TestCase/Shell/OrmCacheShellTest.php
+++ b/tests/TestCase/Shell/OrmCacheShellTest.php
@@ -29,7 +29,7 @@ class OrmCacheShellTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.article', 'core.tag'];
+	public $fixtures = ['core.articles', 'core.tags'];
 
 /**
  * setup method
diff --git a/tests/TestCase/Shell/Task/ControllerTaskTest.php b/tests/TestCase/Shell/Task/ControllerTaskTest.php
index b1431fd58f5..2e70a63a45f 100644
--- a/tests/TestCase/Shell/Task/ControllerTaskTest.php
+++ b/tests/TestCase/Shell/Task/ControllerTaskTest.php
@@ -48,7 +48,7 @@ class ControllerTaskTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.bake_article', 'core.bake_articles_bake_tag', 'core.bake_comment', 'core.bake_tag'];
+	public $fixtures = ['core.bake_articles', 'core.bake_articles_bake_tags', 'core.bake_comments', 'core.bake_tags'];
 
 /**
  * setUp method
diff --git a/tests/TestCase/Shell/Task/FixtureTaskTest.php b/tests/TestCase/Shell/Task/FixtureTaskTest.php
index 48fc2084ccb..e40e3f7aa67 100644
--- a/tests/TestCase/Shell/Task/FixtureTaskTest.php
+++ b/tests/TestCase/Shell/Task/FixtureTaskTest.php
@@ -32,7 +32,7 @@ class FixtureTaskTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.article', 'core.comment', 'core.datatype', 'core.binary_test', 'core.user');
+	public $fixtures = array('core.articles', 'core.comments', 'core.datatypes', 'core.binary_tests', 'core.users');
 
 /**
  * setUp method
diff --git a/tests/TestCase/Shell/Task/ModelTaskTest.php b/tests/TestCase/Shell/Task/ModelTaskTest.php
index ca10d563374..4da7f392ed2 100644
--- a/tests/TestCase/Shell/Task/ModelTaskTest.php
+++ b/tests/TestCase/Shell/Task/ModelTaskTest.php
@@ -35,10 +35,10 @@ class ModelTaskTest extends TestCase {
  * @var array
  */
 	public $fixtures = array(
-		'core.bake_article', 'core.bake_comment', 'core.bake_articles_bake_tag',
-		'core.bake_tag', 'core.user', 'core.category_thread', 'core.number_tree',
-		'core.counter_cache_user', 'core.counter_cache_post',
-		'core.tag', 'core.articles_tag'
+		'core.bake_articles', 'core.bake_comments', 'core.bake_articles_bake_tags',
+		'core.bake_tags', 'core.users', 'core.category_threads', 'core.number_trees',
+		'core.counter_cache_users', 'core.counter_cache_posts',
+		'core.tags', 'core.articles_tags'
 	);
 
 /**
diff --git a/tests/TestCase/Shell/Task/TestTaskTest.php b/tests/TestCase/Shell/Task/TestTaskTest.php
index ef5e67d24cc..d5c0c88cc85 100644
--- a/tests/TestCase/Shell/Task/TestTaskTest.php
+++ b/tests/TestCase/Shell/Task/TestTaskTest.php
@@ -41,11 +41,11 @@ class TestTaskTest extends TestCase {
  * @var string
  */
 	public $fixtures = [
-		'core.article',
-		'core.author',
-		'core.comment',
-		'core.tag',
-		'core.articles_tag',
+		'core.articles',
+		'core.authors',
+		'core.comments',
+		'core.tags',
+		'core.articles_tags',
 	];
 
 /**
@@ -219,10 +219,10 @@ public function testFixtureArrayGenerationFromModel() {
 		$subject = new ArticlesTable();
 		$result = $this->Task->generateFixtureList($subject);
 		$expected = [
-			'app.article',
-			'app.author',
-			'app.tag',
-			'app.articles_tag'
+			'app.articles',
+			'app.authors',
+			'app.tags',
+			'app.articles_tags'
 		];
 		$this->assertEquals($expected, $result);
 	}
@@ -237,7 +237,7 @@ public function testFixtureArrayGenerationIgnoreSelfAssociation() {
 		$subject = new CategoryThreadsTable();
 		$result = $this->Task->generateFixtureList($subject);
 		$expected = [
-			'app.category_thread',
+			'app.category_threads',
 		];
 		$this->assertEquals($expected, $result);
 	}
@@ -251,7 +251,7 @@ public function testFixtureArrayGenerationFromController() {
 		$subject = new PostsController(new Request(), new Response());
 		$result = $this->Task->generateFixtureList($subject);
 		$expected = [
-			'app.post',
+			'app.posts',
 		];
 		$this->assertEquals($expected, $result);
 	}
@@ -316,13 +316,13 @@ public function testBakeFixturesParam() {
 			->method('createFile')
 			->will($this->returnValue(true));
 
-		$this->Task->params['fixtures'] = 'app.post, app.comments , app.user ,';
+		$this->Task->params['fixtures'] = 'app.posts, app.comments , app.users ,';
 		$result = $this->Task->bake('Table', 'Articles');
 
 		$this->assertContains('public $fixtures = [', $result);
-		$this->assertContains('app.post', $result);
+		$this->assertContains('app.posts', $result);
 		$this->assertContains('app.comments', $result);
-		$this->assertContains('app.user', $result);
+		$this->assertContains('app.users', $result);
 		$this->assertNotContains("''", $result);
 	}
 
@@ -393,7 +393,7 @@ public function testBakeControllerTest() {
 		$this->assertNotContains('function tearDown()', $result);
 		$this->assertNotContains('unset($this->Posts)', $result);
 
-		$this->assertContains("'app.post'", $result);
+		$this->assertContains("'app.posts'", $result);
 	}
 
 /**
diff --git a/tests/TestCase/Shell/Task/ViewTaskTest.php b/tests/TestCase/Shell/Task/ViewTaskTest.php
index 5b23dac8838..a37664eadd4 100644
--- a/tests/TestCase/Shell/Task/ViewTaskTest.php
+++ b/tests/TestCase/Shell/Task/ViewTaskTest.php
@@ -84,11 +84,11 @@ class ViewTaskTest extends TestCase {
  * @var array
  */
 	public $fixtures = array(
-		'core.article', 'core.post', 'core.comment',
-		'core.articles_tag',
-		'core.tag',
-		'core.test_plugin_comment',
-		'core.category_thread',
+		'core.articles', 'core.posts', 'core.comments',
+		'core.articles_tags',
+		'core.tags',
+		'core.test_plugin_comments',
+		'core.category_threads',
 	);
 
 /**
diff --git a/tests/TestCase/TestSuite/ControllerTestCaseTest.php b/tests/TestCase/TestSuite/ControllerTestCaseTest.php
index 109ed96e9ad..a0c5a4f2cf3 100644
--- a/tests/TestCase/TestSuite/ControllerTestCaseTest.php
+++ b/tests/TestCase/TestSuite/ControllerTestCaseTest.php
@@ -36,7 +36,7 @@ class ControllerTestCaseTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.post', 'core.author', 'core.test_plugin_comment');
+	public $fixtures = array('core.posts', 'core.authors', 'core.test_plugin_comments');
 
 /**
  * reset environment.
diff --git a/tests/TestCase/TestSuite/TestFixtureTest.php b/tests/TestCase/TestSuite/TestFixtureTest.php
index 7c57d71be73..295c2e24014 100644
--- a/tests/TestCase/TestSuite/TestFixtureTest.php
+++ b/tests/TestCase/TestSuite/TestFixtureTest.php
@@ -132,7 +132,7 @@ class TestFixtureTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.post'];
+	public $fixtures = ['core.posts'];
 
 /**
  * test initializing a static fixture
diff --git a/tests/TestCase/Utility/XmlTest.php b/tests/TestCase/Utility/XmlTest.php
index c2810cc6a29..b713264ccf6 100644
--- a/tests/TestCase/Utility/XmlTest.php
+++ b/tests/TestCase/Utility/XmlTest.php
@@ -39,7 +39,7 @@ class XmlTest extends TestCase {
  * @var array
  */
 	public $fixtures = array(
-		'core.article', 'core.user'
+		'core.articles', 'core.users'
 	);
 
 /**
diff --git a/tests/TestCase/View/Form/EntityContextTest.php b/tests/TestCase/View/Form/EntityContextTest.php
index 5ef1f8b0817..db7ecec21ff 100644
--- a/tests/TestCase/View/Form/EntityContextTest.php
+++ b/tests/TestCase/View/Form/EntityContextTest.php
@@ -41,7 +41,7 @@ class EntityContextTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = ['core.article', 'core.comment'];
+	public $fixtures = ['core.articles', 'core.comments'];
 
 /**
  * setup method.
diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
index 4ef5feb0a22..02f78166912 100644
--- a/tests/TestCase/View/Helper/FormHelperTest.php
+++ b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -118,7 +118,7 @@ class FormHelperTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.article', 'core.comment');
+	public $fixtures = array('core.articles', 'core.comments');
 
 /**
  * Do not load the fixtures by default
@@ -294,7 +294,7 @@ public function contextSelectionProvider() {
  * @return void
  */
 	public function testCreateContextSelectionBuiltIn($data, $class) {
-		$this->loadFixtures('Article');
+		$this->loadFixtures('Articles');
 		$this->Form->create($data);
 		$this->assertInstanceOf($class, $this->Form->context());
 	}
@@ -3683,7 +3683,7 @@ public function testCheckboxZeroValue() {
  * @return void
  */
 	public function testHabtmSelectBox() {
-		$this->loadFixtures('Article');
+		$this->loadFixtures('Articles');
 		$options = array(
 			1 => 'blue',
 			2 => 'red',
@@ -5973,7 +5973,7 @@ public function testFormEnd() {
  * @return void
  */
 	public function testMultiRecordForm() {
-		$this->loadFixtures('Article', 'Comment');
+		$this->loadFixtures('Articles', 'Comments');
 		$articles = TableRegistry::get('Articles');
 		$articles->hasMany('Comments');
 
diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
index a310237c587..13130be6e96 100644
--- a/tests/TestCase/View/ViewTest.php
+++ b/tests/TestCase/View/ViewTest.php
@@ -270,7 +270,7 @@ class ViewTest extends TestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.user', 'core.post');
+	public $fixtures = array('core.users', 'core.posts');
 
 /**
  * setUp method