diff --git a/requirements.txt b/requirements.txt
index 7223eea..679281d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 sqlalchemy >= 2.0.7, < 3.0.0
-ydb >= 3.18.7
-# ydb-dbapi==0.0.1b6
+ydb >= 3.18.8
+ydb-dbapi==0.0.1b7
 /Users/ovcharuk/work/ydb-sqlalchemy/ydb_dbapi-0.0.1b6-py3-none-any.whl
diff --git a/test-requirements.txt b/test-requirements.txt
index 55572c4..ae65d61 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,9 +1,8 @@
 pyyaml==5.3.1
 greenlet
 sqlalchemy==2.0.7
-ydb >= 3.18.7
-# ydb-dbapi==0.0.1b6
-/Users/ovcharuk/work/ydb-sqlalchemy/ydb_dbapi-0.0.1b6-py3-none-any.whl
+ydb >= 3.18.8
+ydb-dbapi==0.0.1b7
 requests<2.29
 pytest==7.2.2
 docker==6.0.1
diff --git a/tox.ini b/tox.ini
index c88b7d4..f654934 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,8 +25,8 @@ ignore_errors = True
 commands =
     docker-compose up -d
     python {toxinidir}/wait_container_ready.py
-    ; pytest -v test --dbdriver ydb --dbdriver ydb_async
-    pytest -v test/test_suite.py::FetchLimitOffsetTest::test_simple_offset --dbdriver ydb --dbdriver ydb_async
+    pytest -v test --dbdriver ydb --dbdriver ydb_async
+    ; pytest -v test/test_suite.py::FetchLimitOffsetTest::test_simple_offset --dbdriver ydb --dbdriver ydb_async
     ; pytest -v test/test_core.py::TestSimpleSelect::test_sa_select_simple test/test_core.py::TestText::test_sa_text test/test_suite.py::ContainerTypesTest::test_struct_type_bind_variable_text --dbdriver ydb --dbdriver ydb_async
     ; pytest -v test_dbapi
     pytest -v ydb_sqlalchemy
diff --git a/ydb_dbapi-0.0.1b6-py3-none-any.whl b/ydb_dbapi-0.0.1b6-py3-none-any.whl
deleted file mode 100644
index a7fa992..0000000
Binary files a/ydb_dbapi-0.0.1b6-py3-none-any.whl and /dev/null differ
diff --git a/ydb_sqlalchemy/sqlalchemy/__init__.py b/ydb_sqlalchemy/sqlalchemy/__init__.py
index c4ccc4e..665aa17 100644
--- a/ydb_sqlalchemy/sqlalchemy/__init__.py
+++ b/ydb_sqlalchemy/sqlalchemy/__init__.py
@@ -271,7 +271,7 @@ def limit_clause(self, select, **kw):
                 select._offset_clause, types.UInt64, skip_types=(types.UInt64, types.UInt32, types.UInt16, types.UInt8)
             )
             if select._limit_clause is None:
-                text += "\n LIMIT NULL"
+                text += "\n LIMIT 1000"  # For some reason, YDB do not support LIMIT NULL OFFSET <num>
             text += " OFFSET " + self.process(offset_clause, **kw)
         return text