diff --git a/testing/ganeti.qa.py b/testing/ganeti.qa.py
index 4ce4d0d76279dd1c09e41f45ae9e9cfdb8797b2a..263846ebb4eff9ff4b87e8dc343e8c9a3ef86627 100755
--- a/testing/ganeti.qa.py
+++ b/testing/ganeti.qa.py
@@ -108,6 +108,8 @@ def GetSSHCommand(node, cmd, strict=True):
   else:
     tmp = 'no'
   args.append('-oStrictHostKeyChecking=%s' % tmp)
+  args.append('-oClearAllForwardings=yes')
+  args.append('-oForwardAgent=yes')
   args.append(node)
 
   if options.dry_run: