diff --git a/test/app-tap/datetime.test.lua b/test/app-tap/datetime.test.lua
index e070c1e4aa9182f38823ea58882b2d306df9e19e..aafe2e4df5c888e5410f147fea00c901bcd0e298 100755
--- a/test/app-tap/datetime.test.lua
+++ b/test/app-tap/datetime.test.lua
@@ -5,6 +5,12 @@ local test = tap.test('errno')
 local date = require('datetime')
 local ffi = require('ffi')
 
+--[[
+    Workaround for #6599 where we may randomly fail on AWS Graviton machines,
+    while it's working properly when jit disabled.
+--]]
+if jit.arch == 'arm64' then jit.off() end
+
 test:plan(13)
 
 -- minimum supported date - -5879610-06-22