diff --git a/Dockerfile-cubrid b/tests/cubrid/Dockerfile
similarity index 100%
rename from Dockerfile-cubrid
rename to tests/cubrid/Dockerfile
diff --git a/tests/cubrid/docker-compose.yml b/tests/cubrid/docker-compose.yml
index d2fbb8f..8085334 100644
--- a/tests/cubrid/docker-compose.yml
+++ b/tests/cubrid/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   php:
     build:
       context: ../..
-      dockerfile: Dockerfile-cubrid
+      dockerfile: tests/cubrid/Dockerfile
     ports:
       - 80
     #volumes:
diff --git a/Dockerfile-mssql b/tests/mssql/Dockerfile
similarity index 100%
rename from Dockerfile-mssql
rename to tests/mssql/Dockerfile
diff --git a/tests/mssql/docker-compose.yml b/tests/mssql/docker-compose.yml
index dde8cad..a68eb35 100644
--- a/tests/mssql/docker-compose.yml
+++ b/tests/mssql/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   php:
     build:
       context: ../..
-      dockerfile: Dockerfile-mssql
+      dockerfile: tests/mssql/Dockerfile
     # Alternative pre-built image (TODO: evaluate)
     #image: ppoffice/apache-php-mssql-odbc
     ports: