diff --git a/dbms/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql b/dbms/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
index 1f9f32a3a6a..df964d3a90c 100644
--- a/dbms/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
+++ b/dbms/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
@@ -1,3 +1,5 @@
+CREATE DATABASE IF NOT EXISTS test_00857;
+USE test_00857;
 DROP TABLE IF EXISTS local_table;
 DROP TABLE IF EXISTS other_table;
 
@@ -22,9 +24,8 @@ INSERT INTO local_table VALUES(2, 'Two', now(), 200);
 INSERT INTO other_table VALUES(100, 'One Hundred', now(), 1000);
 INSERT INTO other_table VALUES(200, 'Two Hundred', now(), 2000);
 
--- FIXME: other_table -> other_table in first query breaks test (external tables cache error)
 select t2.name from remote('127.0.0.2', currentDatabase(), 'local_table') as t1
-left join other_table as t2
+left join test_00857.other_table as t2 -- FIXME: doesn't work properly on remote without explicit database prefix
 on t1.oth_id = t2.id
 order by t2.name;
 
@@ -55,3 +56,4 @@ order by other_table.name;
 
 DROP TABLE local_table;
 DROP TABLE other_table;
+DROP DATABASE test_00857;
diff --git a/dbms/tests/queries/conftest.py b/dbms/tests/queries/conftest.py
index 56d388bdc52..47e87ed7e10 100644
--- a/dbms/tests/queries/conftest.py
+++ b/dbms/tests/queries/conftest.py
@@ -37,10 +37,8 @@ def sql_query(request):
 
 
 @pytest.fixture
-def standalone_server(bin_prefix):
-    tmp_dir = tempfile.mkdtemp(prefix='clickhouse.test..')
-
-    server = ServerThread(bin_prefix, tmp_dir)
+def standalone_server(bin_prefix, tmp_path):
+    server = ServerThread(bin_prefix, str(tmp_path))
     server.start()
     wait_result = server.wait()