diff --git a/.github/workflows/rust-cubesql.yml b/.github/workflows/rust-cubesql.yml
index 702cc63e3ed77..c4d57686e5b37 100644
--- a/.github/workflows/rust-cubesql.yml
+++ b/.github/workflows/rust-cubesql.yml
@@ -40,13 +40,16 @@ jobs:
           key: cubesql-${{ runner.OS }}-x86_64-unknown-linux-gnu
           shared-key: cubesql-${{ runner.OS }}-x86_64-unknown-linux-gnu
       - name: Lint CubeSQL
-        run: cd rust/cubesql/cubesql && cargo fmt --all -- --check
+        run: cd rust/cubesql && cargo fmt --all -- --check
       - name: Lint Native
         run: cd packages/cubejs-backend-native && cargo fmt --all -- --check
+      # TODO replace with clippy once cubesql is ready
+      - name: Check CubeSQL
+        run: cd rust/cubesql && cargo check --locked --workspace --all-targets --keep-going
       - name: Clippy Native
-        run: cd packages/cubejs-backend-native && cargo clippy -- -D warnings
+        run: cd packages/cubejs-backend-native && cargo clippy --locked --workspace --all-targets --keep-going -- -D warnings
       - name: Clippy Native (with Python)
-        run: cd packages/cubejs-backend-native && cargo clippy --features python -- -D warnings
+        run: cd packages/cubejs-backend-native && cargo clippy --locked --workspace --all-targets --keep-going --features python -- -D warnings
       # CubeSQL is not ready for Clippy
       #- name: Clippy CubeSQL
       #  run: cd rust/cubesql && cargo clippy -- -D warnings
diff --git a/rust/cubesql/cubesql/benches/large_model.rs b/rust/cubesql/cubesql/benches/large_model.rs
index 58b6227e203f6..01850405c8d8a 100644
--- a/rust/cubesql/cubesql/benches/large_model.rs
+++ b/rust/cubesql/cubesql/benches/large_model.rs
@@ -20,8 +20,8 @@ use uuid::Uuid;
 macro_rules! bench_large_model {
     ($DIMS:expr, $NAME:expr, $QUERY_FN:expr, $CRITERION:expr) => {{
         let context = Arc::new(
-            futures::executor::block_on(create_test_cube_context(
-                create_test_postgresql_cube_context($DIMS),
+            futures::executor::block_on(create_test_postgresql_cube_context(
+                get_large_model_test_tenant_ctx($DIMS),
             ))
             .unwrap(),
         );