diff --git a/SConstruct b/SConstruct
index 0d8159bbab..bb038b8fbe 100755
--- a/SConstruct
+++ b/SConstruct
@@ -139,7 +139,7 @@ if GetOption('no_lto') and GetOption('force_lto'):
 #
 ########################################################################
 
-main = Environment()
+main = Environment(tools=['default', 'git'])
 
 from gem5_scons.util import get_termcap
 termcap = get_termcap()
diff --git a/site_scons/site_tools/default.py b/site_scons/site_tools/default.py
index 1965a20173..88a693237d 100644
--- a/site_scons/site_tools/default.py
+++ b/site_scons/site_tools/default.py
@@ -78,15 +78,9 @@ def common_config(env):
     # as well
     env.AppendENVPath('PYTHONPATH', extra_python_paths)
 
-gem5_tool_list = [
-    'git',
-]
-
 def generate(env):
     common_config(env)
     SCons.Tool.default.generate(env)
-    for tool in gem5_tool_list:
-        SCons.Tool.Tool(tool)(env)
 
 def exists(env):
     return 1