diff --git a/ci/scripts/run-e2e-test.sh b/ci/scripts/run-e2e-test.sh
index c64b54ca25a43..4736f4aa53a8a 100755
--- a/ci/scripts/run-e2e-test.sh
+++ b/ci/scripts/run-e2e-test.sh
@@ -80,9 +80,6 @@ RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=i
 cluster_start
 # Please make sure the regression is expected before increasing the timeout.
 sqllogictest -p 4566 -d dev './e2e_test/streaming/**/*.slt' --junit "streaming-${profile}"
-if [[ "$mode" != "single-node" ]]; then
-  sqllogictest -p 4566 -d dev './e2e_test/streaming_now/**/*.slt' --junit "streaming-${profile}"
-fi
 sqllogictest -p 4566 -d dev './e2e_test/backfill/sink/different_pk_and_dist_key.slt'
 
 echo "--- Kill cluster"
diff --git a/e2e_test/streaming_now/now.slt b/e2e_test/streaming/now.slt
similarity index 61%
rename from e2e_test/streaming_now/now.slt
rename to e2e_test/streaming/now.slt
index ea9f85a489786..9649489fbbd95 100644
--- a/e2e_test/streaming_now/now.slt
+++ b/e2e_test/streaming/now.slt
@@ -1,12 +1,13 @@
-system ok
-./risedev psql -c "
+control substitution on
+
+statement ok
 create materialized view mv as
 select * from generate_series(
-    to_timestamp($(date +%s)) - interval '10 second',
+    -- $__NOW__ is in nanoseconds, `to_timestamp` expects seconds
+    to_timestamp($__NOW__ / 1000.0 / 1000.0 / 1000.0) - interval '10 second',
     now(),
     interval '1 second'
 );
-"
 
 statement ok
 flush;
diff --git a/e2e_test/streaming_now/README b/e2e_test/streaming_now/README
deleted file mode 100644
index ad5d817e3c958..0000000000000
--- a/e2e_test/streaming_now/README
+++ /dev/null
@@ -1 +0,0 @@
-Because currently the e2e test for `generate_series(..., now(), ...)` relies on external command `./risedev psql`, it cannot be tested in parallel, madsim and single-node mode. Let's just place it in this special folder and manually run it in `run-e2e-test.sh` to avoid complexity. Later if we introduce a new `now()`-like function that returns the time of statement execution, we'll be able to get rid of the external command and direcly create MV instead. We will move this to `streaming` folder at that time.