diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 798c7c54e..78fc4d836 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@ on:
       - '*'
     paths-ignore:
       - README.md
+
 env:
   MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
@@ -23,7 +24,7 @@ jobs:
         target: [test-without-scala, test-scala]
         include:
           - target: test-without-scala
-            containers: db2 mysql postgresql mongo sqlserver oracle
+            containers: db2 mysql postgresql mongo sqlserver oracle cubrid firebird
             maven-args: --activate-profiles all,travis,examples --projects !querydsl-scala
 
           - target: test-scala
@@ -45,8 +46,8 @@ jobs:
         run: |
           cd travis/ &&\
           docker-compose up --detach ${{ matrix.containers }} &&\
-          docker ps &&\
-          time docker-compose up block-until-healthy
+          time docker-compose up block-until-healthy &&\
+          docker ps
 
       - name: Initialize cache
         uses: actions/cache@v1
diff --git a/pom.xml b/pom.xml
index 47c1b95d0..ae5dc5a88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -687,9 +687,7 @@
           com.querydsl.core.testutil.Performance,
           com.querydsl.core.testutil.ReportingOnly,
 
-          com.querydsl.core.testutil.Teradata,
-          com.querydsl.core.testutil.CUBRID,
-          com.querydsl.core.testutil.Firebird
+          com.querydsl.core.testutil.Teradata
         </excludedGroups>
       </properties>
       <build>
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java
index 250b38e1e..57d7bf7e1 100644
--- a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java
@@ -101,7 +101,7 @@ public final class Connections {
 
     private static Connection getFirebird() throws SQLException, ClassNotFoundException {
         Class.forName("org.firebirdsql.jdbc.FBDriver");
-        String url = "jdbc:firebirdsql:localhost/3050:/databases/querydsl.fdb";
+        String url = "jdbc:firebirdsql:localhost/3050:/firebird/data/querydsl.fdb";
         return DriverManager.getConnection(url, "sysdba", "masterkey");
     }
 
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java
index 6cb1650d5..4c251fff8 100644
--- a/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java
@@ -65,7 +65,7 @@ public class InsertBase extends AbstractBaseTest {
     }
 
     @Test
-    @ExcludeIn(SQLITE) // https://bitbucket.org/xerial/sqlite-jdbc/issue/133/prepstmtsetdate-int-date-calendar-seems
+    @ExcludeIn({CUBRID, SQLITE}) // https://bitbucket.org/xerial/sqlite-jdbc/issue/133/prepstmtsetdate-int-date-calendar-seems
     public void insert_dates() {
         QDateTest dateTest = QDateTest.qDateTest;
         LocalDate localDate = new LocalDate(1978, 1, 2);
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
index ef16f22b5..12adfb4ee 100644
--- a/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
@@ -533,7 +533,7 @@ public class SelectBase extends AbstractBaseTest {
         DateTimeExpression<java.util.Date> dt = Expressions.currentTimestamp();
 
         add(exprs, SQLExpressions.addYears(dt, 1));
-        add(exprs, SQLExpressions.addMonths(dt, 1));
+        add(exprs, SQLExpressions.addMonths(dt, 1), ORACLE);
         add(exprs, SQLExpressions.addDays(dt, 1));
         add(exprs, SQLExpressions.addHours(dt, 1), TERADATA);
         add(exprs, SQLExpressions.addMinutes(dt, 1), TERADATA);
diff --git a/travis/docker-compose.yml b/travis/docker-compose.yml
index 5ae24d33d..d86697cee 100644
--- a/travis/docker-compose.yml
+++ b/travis/docker-compose.yml
@@ -4,6 +4,8 @@ services:
   block-until-healthy:
     image: alpine:latest
     depends_on:
+      cubrid:
+        condition: service_healthy
       db2:
         condition: service_healthy
       sqlserver:
@@ -40,12 +42,18 @@ services:
 
   cubrid:
     image: lighthopper/cubrid:9.2.26.0004
+    command: "./create-start-demodb.sh"
     ports:
       - "33000:33000"
       - "30000:30000"
       - "8001:8001"
       - "8002:8002"
       - "1523:1523"
+    healthcheck:
+      test: csql demodb -c "SELECT 1"
+      interval: 5s
+      timeout: 60s
+      start_period: 60s
 
   mongo:
     image: mongo:3.6.1
@@ -85,7 +93,7 @@ services:
       start_period: 60s
 
   firebird:
-    image: jacobalberty/firebird:2.5.6-ss
+    image: jacobalberty/firebird:2.5.9-ss
     ports:
       - "3050:3050"
     environment: