diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7e23169a92111a9246e51c49360bad94951401f..24877d89046f3e38c68c130b9bbcc866ecd620d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,9 +76,6 @@ deploy:
 # test post-deploy
 test-post-deploy-matlab-9.2.0_tcv:
   extends: .test-post-deploy-template
-  script:
-  - export
-  - mkdir -f /tmp/$USER; cd /tmp/$USER
   variables:
     MATLABCMD: matlab920
 
diff --git a/matlab/tests/test_requestnames.m b/matlab/tests/test_requestnames.m
index 557144ccdb55fdc352bb83cf17315892f15429ad..6afae507357150f05e61c55c125429f9fe89ba44 100644
--- a/matlab/tests/test_requestnames.m
+++ b/matlab/tests/test_requestnames.m
@@ -16,9 +16,17 @@ classdef (SharedTestFixtures={...
   methods(Static)
     function test_gdat_call(testCase,shot,request)
       % actual function to test gdat call
+      import matlab.unittest.fixtures.WorkingFolderFixture;
+
       testCase.assertTrue(isnumeric(str2double(shot)));
       testCase.assertTrue(ischar(request));
-
+      pwd
+      dirname_for_test = sprintf('/tmp/%s/gdat',getenv('USER')); % to have write permission
+      [dummy1,dummy2]=rmdir(dirname_for_test,'s');
+      mkdir(dirname_for_test);
+      f = WorkingFolderFixture(dirname_for_test);
+      testCase.applyFixture(f);
+      pwd
       % gdat call
       gdat_call = sprintf(['gdat_' lower(testCase.Machine) '(%s,''%s'')'],shot,request);
       do_gdat_call = 1;