diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/dockerfile/grpc_jenkins_slave_x64/Dockerfile
similarity index 100%
rename from tools/jenkins/grpc_jenkins_slave/Dockerfile
rename to tools/dockerfile/grpc_jenkins_slave_x64/Dockerfile
diff --git a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile b/tools/dockerfile/grpc_jenkins_slave_x86/Dockerfile
similarity index 100%
rename from tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile
rename to tools/dockerfile/grpc_jenkins_slave_x86/Dockerfile
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 767b801c2af34c1813f10baaa03123770c227015..7482824099e4ceb8a9743b9069b80b6f87dcfae2 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -576,9 +576,9 @@ def _windows_toolset_option(compiler):
 def _get_dockerfile_dir(arch):
   """Returns dockerfile to use"""
   if arch == 'default' or arch == 'x64':
-    return 'tools/jenkins/grpc_jenkins_slave'
+    return 'tools/dockerfile/grpc_jenkins_slave_x64'
   elif arch == 'x86':
-    return 'tools/jenkins/grpc_jenkins_slave_32bits'
+    return 'tools/dockerfile/grpc_jenkins_slave_x86'
   else:
     print 'Architecture %s not supported with current settings.' % arch
     sys.exit(1)