diff --git a/pom.xml b/pom.xml
index a13081ea4..992717beb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <hsqldb.version>2.6.0</hsqldb.version>
     <h2.version>1.4.197</h2.version>
     <postgresql.version>42.3.4</postgresql.version>
-    <oracle.version>11.2.0.4</oracle.version>
+    <oracle.version>21.7.0.0</oracle.version>
     <mysql.version>8.0.29</mysql.version>
     <mssql.version>11.2.1.jre8</mssql.version>
     <cubrid.version>9.3.9.0002</cubrid.version>
@@ -432,7 +432,7 @@
                     <exclude>org.apche.derby:derby:*:*:compile</exclude>
                     <exclude>mysql:mysql-connector-java:*:*:compile</exclude>
                     <exclude>com.microsoft.sqlserver:mssql-jdbc:*:*:compile</exclude>
-                    <exclude>com.oracle:ojdbc6:*:*:compile</exclude>
+                    <exclude>com.oracle:ojdbc8:*:*:compile</exclude>
                     <exclude>org.postgresql:postgresql:*:*:compile</exclude>
                     <exclude>cubrid:cubrid-jdbc:*:*:compile</exclude>
                     <exclude>org.firebirdsql.jdbc:jaybird:*:*:compile</exclude>
diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index 1993cf120..ea4f5a7b8 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -194,7 +194,7 @@
     </dependency>
     <dependency>
       <groupId>com.oracle.database.jdbc</groupId>
-      <artifactId>ojdbc6</artifactId>
+      <artifactId>ojdbc8</artifactId>
       <version>${oracle.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java
index 5584d57b5..1533578bb 100644
--- a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java
@@ -1,5 +1,8 @@
 package com.querydsl.jpa.suites;
 
+import java.util.TimeZone;
+
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.experimental.categories.Category;
 
@@ -17,10 +20,23 @@ public class OracleSuiteTest extends AbstractSuite {
     public static class Hibernate extends HibernateBase { }
     public static class HibernateSQL extends HibernateSQLBase { }
 
+    private static TimeZone defaultZone;
+    
     @BeforeClass
     public static void setUp() throws Exception {
         Mode.mode.set("oracle");
         Mode.target.set(Target.ORACLE);
+        
+        // change time zone to work around ORA-01882
+        // see https://gist.github.com/jarek-przygodzki/cbea3cedae3aef2bbbe0ff6b057e8321
+        // the test may work fine on your machine without this, but it fails when the GitHub runner executes it
+        defaultZone = TimeZone.getDefault();
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+    
+    @AfterClass
+    public static void tearDown() {
+        TimeZone.setDefault(defaultZone);
     }
 
 }
diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml
index a59bf2b64..32feee32c 100644
--- a/querydsl-sql-codegen/pom.xml
+++ b/querydsl-sql-codegen/pom.xml
@@ -97,7 +97,7 @@
     </dependency>
     <dependency>
       <groupId>com.oracle.database.jdbc</groupId>
-      <artifactId>ojdbc6</artifactId>
+      <artifactId>ojdbc8</artifactId>
       <version>${oracle.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java
index 3f22b1e65..2b12a82ab 100644
--- a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java
@@ -13,6 +13,8 @@
  */
 package com.querydsl.sql.codegen;
 
+import java.util.TimeZone;
+
 import org.junit.BeforeClass;
 import org.junit.experimental.categories.Category;
 
@@ -24,7 +26,16 @@ public class ExportOracleTest extends ExportBaseTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        Connections.initOracle();
+        TimeZone tz = TimeZone.getDefault();
+        try {
+            // change time zone to work around ORA-01882
+            // see https://gist.github.com/jarek-przygodzki/cbea3cedae3aef2bbbe0ff6b057e8321
+            // the test may work fine on your machine without this, but it fails when the GitHub runner executes it
+            TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+            Connections.initOracle();
+        } finally {
+            TimeZone.setDefault(tz);
+        }
     }
 
     @Override
diff --git a/querydsl-sql-spatial/pom.xml b/querydsl-sql-spatial/pom.xml
index a47e83a26..c787c01ee 100644
--- a/querydsl-sql-spatial/pom.xml
+++ b/querydsl-sql-spatial/pom.xml
@@ -119,7 +119,7 @@
     </dependency>
     <dependency>
       <groupId>com.oracle.database.jdbc</groupId>
-      <artifactId>ojdbc6</artifactId>
+      <artifactId>ojdbc8</artifactId>
       <version>${oracle.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 9c9c41451..8b8f5f15d 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -107,7 +107,7 @@
     </dependency>
     <dependency>
       <groupId>com.oracle.database.jdbc</groupId>
-      <artifactId>ojdbc6</artifactId>
+      <artifactId>ojdbc8</artifactId>
       <version>${oracle.version}</version>
       <scope>test</scope>
     </dependency>