diff --git a/extra/dist/tarantoolctl b/extra/dist/tarantoolctl
index 1906ff7bfdd287659c33f830a2d34cf261cbd233..9c97ab617fd016f50facdd5fa52f9ce81db6f522 100755
--- a/extra/dist/tarantoolctl
+++ b/extra/dist/tarantoolctl
@@ -178,10 +178,13 @@ end
 
 local function check_user_level()
     -- local dir configuration
-    local local_dir = '.tarantoolctl'
-    if fio.stat(local_dir) then
-        usermode = true
-        return local_dir
+    local pwd = os.getenv('PWD')
+    if pwd ~= nil then
+        local local_dir = pwd .. '/.tarantoolctl'
+        if fio.stat(local_dir) then
+            usermode = true
+            return local_dir
+        end
     end
 
     -- home dir configuration
diff --git a/test-run b/test-run
index 271a009b22b290734f75f2d674a9e664224ea95f..9c05fb7c36dfe11b5dd2f8ab2293d1be521b8ced 160000
--- a/test-run
+++ b/test-run
@@ -1 +1 @@
-Subproject commit 271a009b22b290734f75f2d674a9e664224ea95f
+Subproject commit 9c05fb7c36dfe11b5dd2f8ab2293d1be521b8ced