diff --git a/Dockerfile-cubrid b/Dockerfile-cubrid
index e443a05de27..92203cf3e55 100644
--- a/Dockerfile-cubrid
+++ b/Dockerfile-cubrid
@@ -1,11 +1,11 @@
-FROM php:5
-
-
-RUN pecl install cubrid
-RUN echo "extension=cubrid.so" > cubrid.ini
+FROM php:5-fpm
 
+# /usr/local/lib/php/extensions/no-debug-non-zts-20131226/cubrid.so
+RUN pecl install pdo_cubrid-9.3.0.0001
+RUN echo "extension=pdo_cubrid.so" > /usr/local/etc/php/conf.d/cubrid.ini
 
 
+# TODO: temporary section --->
 # Install system packages for composer (git)
 RUN apt-get update && \
     apt-get -y install \
@@ -13,22 +13,17 @@ RUN apt-get update && \
         --no-install-recommends && \
         apt-get clean && \
         rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-
-
 # Register the COMPOSER_HOME environment variable
 ENV COMPOSER_HOME /composer
-
 # Add global binary directory to PATH and make sure to re-export it
 ENV PATH /usr/local/bin:$PATH
-
 # Allow Composer to be run as root
 ENV COMPOSER_ALLOW_SUPERUSER 1
-
 # Install composer
 RUN curl -sS https://getcomposer.org/installer | php -- \
         --filename=composer.phar \
         --install-dir=/usr/local/bin
+# TODO: <--- end
 
 # Project source-code
 ADD ./ /project
diff --git a/tests/README.md b/tests/README.md
index b9ac659acb8..79e8134bb4a 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -74,6 +74,10 @@ Run phpunit directly
     docker-compose run --rm php vendor/bin/phpunit -v --group caching,db   
     docker-compose run --rm php vendor/bin/phpunit -v --exclude base,caching,db,i18n,log,mutex,rbac,validators,web
 
+### Cubrid
+
+    docker-compose run --rm php vendor/bin/phpunit -v --group cubrid
+
 ### MSSQL    
 
 **experimental**
diff --git a/tests/docker-compose.cubrid.yml b/tests/docker-compose.cubrid.yml
index 1108d48d0d1..ce22e606b57 100644
--- a/tests/docker-compose.cubrid.yml
+++ b/tests/docker-compose.cubrid.yml
@@ -5,14 +5,13 @@ services:
     build:
       context: ..
       dockerfile: Dockerfile-cubrid
-    #entrypoint: ['bash']
     ports:
       - 80
     volumes:
       - ../:/app
     depends_on:
-      #- mssql
       - cubrid
 
   cubrid:
-    image: lighthopper/cubrid
\ No newline at end of file
+    image: lighthopper/cubrid
+    command: ./create-start-demodb.sh
\ No newline at end of file