diff --git a/.gitignore b/.gitignore
index 54ac71ff..16ad3316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 /examples/nosql/vendor
 /examples/nosql/config/oauth2.sqlite3
 /examples/relational/composer.lock
-/tests/codecept/tests/_log
\ No newline at end of file
+/tests/functional/tests/_log
\ No newline at end of file
diff --git a/tests/codecept/codeception.yml b/tests/functional/codeception.yml
similarity index 100%
rename from tests/codecept/codeception.yml
rename to tests/functional/codeception.yml
diff --git a/tests/codecept/tests/_bootstrap.php b/tests/functional/tests/_bootstrap.php
similarity index 100%
rename from tests/codecept/tests/_bootstrap.php
rename to tests/functional/tests/_bootstrap.php
diff --git a/tests/codecept/tests/_helpers/ApiHelper.php b/tests/functional/tests/_helpers/ApiHelper.php
similarity index 100%
rename from tests/codecept/tests/_helpers/ApiHelper.php
rename to tests/functional/tests/_helpers/ApiHelper.php
diff --git a/tests/codecept/tests/api.suite.yml b/tests/functional/tests/api.suite.yml
similarity index 100%
rename from tests/codecept/tests/api.suite.yml
rename to tests/functional/tests/api.suite.yml
diff --git a/tests/codecept/tests/api/ApiGuy.php b/tests/functional/tests/api/ApiGuy.php
similarity index 100%
rename from tests/codecept/tests/api/ApiGuy.php
rename to tests/functional/tests/api/ApiGuy.php
diff --git a/tests/codecept/tests/api/GetUsersAllFieldsCept.php b/tests/functional/tests/api/GetUsersAllFieldsCept.php
similarity index 100%
rename from tests/codecept/tests/api/GetUsersAllFieldsCept.php
rename to tests/functional/tests/api/GetUsersAllFieldsCept.php
diff --git a/tests/codecept/tests/api/GetUsersBasicEmailFieldsCept.php b/tests/functional/tests/api/GetUsersBasicEmailFieldsCept.php
similarity index 100%
rename from tests/codecept/tests/api/GetUsersBasicEmailFieldsCept.php
rename to tests/functional/tests/api/GetUsersBasicEmailFieldsCept.php
diff --git a/tests/codecept/tests/api/GetUsersBasicPhotoFieldsCept.php b/tests/functional/tests/api/GetUsersBasicPhotoFieldsCept.php
similarity index 100%
rename from tests/codecept/tests/api/GetUsersBasicPhotoFieldsCept.php
rename to tests/functional/tests/api/GetUsersBasicPhotoFieldsCept.php
diff --git a/tests/codecept/tests/api/GetUsersInvalidTokenCept.php b/tests/functional/tests/api/GetUsersInvalidTokenCept.php
similarity index 100%
rename from tests/codecept/tests/api/GetUsersInvalidTokenCept.php
rename to tests/functional/tests/api/GetUsersInvalidTokenCept.php
diff --git a/tests/codecept/tests/api/GetUsersNoTokenCept.php b/tests/functional/tests/api/GetUsersNoTokenCept.php
similarity index 100%
rename from tests/codecept/tests/api/GetUsersNoTokenCept.php
rename to tests/functional/tests/api/GetUsersNoTokenCept.php
diff --git a/tests/codecept/tests/api/GetUsersTokenHeaderCept.php b/tests/functional/tests/api/GetUsersTokenHeaderCept.php
similarity index 100%
rename from tests/codecept/tests/api/GetUsersTokenHeaderCept.php
rename to tests/functional/tests/api/GetUsersTokenHeaderCept.php
diff --git a/tests/codecept/tests/api/_bootstrap.php b/tests/functional/tests/api/_bootstrap.php
similarity index 100%
rename from tests/codecept/tests/api/_bootstrap.php
rename to tests/functional/tests/api/_bootstrap.php