diff --git a/app/tests/cases/behaviors/empty b/app/tests/Case/Controller/Component/empty
similarity index 100%
rename from app/tests/cases/behaviors/empty
rename to app/tests/Case/Controller/Component/empty
diff --git a/app/tests/cases/components/empty b/app/tests/Case/Controller/empty
similarity index 100%
rename from app/tests/cases/components/empty
rename to app/tests/Case/Controller/empty
diff --git a/app/tests/cases/controllers/empty b/app/tests/Case/Model/Behavior/empty
similarity index 100%
rename from app/tests/cases/controllers/empty
rename to app/tests/Case/Model/Behavior/empty
diff --git a/app/tests/cases/helpers/empty b/app/tests/Case/Model/empty
similarity index 100%
rename from app/tests/cases/helpers/empty
rename to app/tests/Case/Model/empty
diff --git a/app/tests/cases/models/empty b/app/tests/Case/View/Helper/empty
similarity index 100%
rename from app/tests/cases/models/empty
rename to app/tests/Case/View/Helper/empty
diff --git a/app/tests/fixtures/empty b/app/tests/Fixture/empty
similarity index 100%
rename from app/tests/fixtures/empty
rename to app/tests/Fixture/empty
diff --git a/app/tests/groups/empty b/app/tests/groups/empty
deleted file mode 100644
index e69de29bb..000000000