diff --git a/e2e_test/batch/types/timestamp_ns.slt.part b/e2e_test/batch/types/timestamp_ns.slt.part
index a7d8b167442be..e6bd971fd05ab 100644
--- a/e2e_test/batch/types/timestamp_ns.slt.part
+++ b/e2e_test/batch/types/timestamp_ns.slt.part
@@ -138,7 +138,7 @@ select v2, count(*) from t1 group by v2;
 2213-01-01 01:01:01.123456789 1
 NULL 1
 
-query T rowsort
+query T
 select * from t1 order by v2 desc;
 ----
 5  NULL
diff --git a/src/expr/impl/src/scalar/extract.rs b/src/expr/impl/src/scalar/extract.rs
index 986d1f3e1ce6d..7aa59ef3e990c 100644
--- a/src/expr/impl/src/scalar/extract.rs
+++ b/src/expr/impl/src/scalar/extract.rs
@@ -448,9 +448,9 @@ mod tests {
         assert_eq!(extract(Hour), "23");
         assert_eq!(extract(Minute), "22");
         assert_eq!(extract(Second), "57.123450");
-        assert_eq!(extract(Millisecond), "57123.450");
-        assert_eq!(extract(Microsecond), "57123450");
-        assert_eq!(extract(Epoch), "84177.123450");
+        assert_eq!(extract(Millisecond), "57123.450000");
+        assert_eq!(extract(Microsecond), "57123450.000");
+        assert_eq!(extract(Epoch), "84177.12345000");
     }
 
     #[test]