diff --git a/connectorx-python/connectorx/tests/test_oracle.py b/connectorx-python/connectorx/tests/test_oracle.py
index ef6d8c0f2..b14db9972 100644
--- a/connectorx-python/connectorx/tests/test_oracle.py
+++ b/connectorx-python/connectorx/tests/test_oracle.py
@@ -16,7 +16,7 @@ def oracle_url() -> str:
 @pytest.mark.skipif(
     not os.environ.get("ORACLE_URL"), reason="Test oracle only when `ORACLE_URL` is set"
 )
-def test_on_non_select(oracle_url: str) -> None:
+def test_oracle_on_non_select(oracle_url: str) -> None:
     query = "CREATE TABLE non_select(id INTEGER NOT NULL)"
     read_sql(oracle_url, query)
 
diff --git a/connectorx/src/transports/oracle_arrow.rs b/connectorx/src/transports/oracle_arrow.rs
index da7d657c1..b9ef0453a 100644
--- a/connectorx/src/transports/oracle_arrow.rs
+++ b/connectorx/src/transports/oracle_arrow.rs
@@ -41,9 +41,9 @@ impl_transport!(
         { Char[String]               => LargeUtf8[String]          | conversion none }
         { NVarChar[String]           => LargeUtf8[String]          | conversion none }
         { NChar[String]              => LargeUtf8[String]          | conversion none }
-        { Date[NaiveDateTime]        => Date64[NaiveDateTime]      | conversion auto }
-        { Timestamp[NaiveDateTime]   => Date64Micro[NaiveDateTimeWrapperMicro]  | conversion option }
-        { TimestampNano[NaiveDateTime]   => Date64[NaiveDateTime]      | conversion none }
+        { Date[NaiveDateTime]        => Date64Micro[NaiveDateTimeWrapperMicro]  | conversion option }
+        { Timestamp[NaiveDateTime]   => Date64Micro[NaiveDateTimeWrapperMicro]  | conversion none }
+        { TimestampNano[NaiveDateTime]   => Date64[NaiveDateTime]      | conversion auto }
         { TimestampTz[DateTime<Utc>] => DateTimeTz[DateTimeWrapperMicro]        | conversion option }
         { TimestampTzNano[DateTime<Utc>] => DateTimeTz[DateTime<Utc>]  | conversion auto }
     }
diff --git a/connectorx/src/transports/oracle_arrow2.rs b/connectorx/src/transports/oracle_arrow2.rs
index 753bcebd1..fbb1a68e8 100644
--- a/connectorx/src/transports/oracle_arrow2.rs
+++ b/connectorx/src/transports/oracle_arrow2.rs
@@ -41,9 +41,9 @@ impl_transport!(
         { Char[String]                  => LargeUtf8[String]            | conversion none }
         { NVarChar[String]              => LargeUtf8[String]            | conversion none }
         { NChar[String]                 => LargeUtf8[String]            | conversion none }
-        { Date[NaiveDateTime]           => Date64[NaiveDateTime]        | conversion auto }
-        { Timestamp[NaiveDateTime]      => Date64Micro[NaiveDateTimeWrapperMicro]       | conversion option }
-        { TimestampNano[NaiveDateTime]      => Date64[NaiveDateTime]        | conversion none }
+        { Date[NaiveDateTime]           => Date64Micro[NaiveDateTimeWrapperMicro]       | conversion option }
+        { Timestamp[NaiveDateTime]      => Date64Micro[NaiveDateTimeWrapperMicro]       | conversion none }
+        { TimestampNano[NaiveDateTime]      => Date64[NaiveDateTime]        | conversion auto }
         { TimestampTz[DateTime<Utc>]    => DateTimeTzMicro[DateTimeWrapperMicro]        | conversion option }
         { TimestampTzNano[DateTime<Utc>]    => DateTimeTz[DateTime<Utc>]    | conversion auto }
     }