diff --git a/tester.py b/tester.py
index 4470979257a684da9cc90b864b961e36cb853fba..8c4ac97c1e67bb5803f0f3216ddce00824407ea4 100755
--- a/tester.py
+++ b/tester.py
@@ -78,6 +78,8 @@ class Tester():
         if whoami != 'root' and not debug:
             log('This script should be run as root user.')
             sys.exit(1)
+        # Update envsetup files
+        subprocess.call(['python3', 'update_envsetup.py'])
         # Load conf
         conf = utils.load_conf()
         if not conf:
diff --git a/update_envsetup.py b/update_envsetup.py
index 3795f13e31fe77df14eb785f69ec6ab8c506bf89..5532477a09170db2376286e2ee310bf24664c3d1 100755
--- a/update_envsetup.py
+++ b/update_envsetup.py
@@ -9,7 +9,7 @@ if __name__ == '__main__':
     os.chdir(os.path.dirname(os.path.abspath(os.path.expanduser(__file__))))
     sys.stdout.write('Updating envsetup: ')
     sys.stdout.flush()
-    subprocess.check_call('git pull', shell=True)
     subprocess.call('find . -name *.pyc -type f -delete', shell=True)
     subprocess.call('find . -name __pycache__ -type d -delete', shell=True)
+    subprocess.call('git pull', shell=True)
     subprocess.call('find . -type d -empty -delete', shell=True)