diff --git a/.gitignore b/.gitignore
index a60777212dac..11a617328327 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ site-local
 *.pyc
 *.sw[po]
 /*.rom
+.test
+.dependencies
 
 # Development friendly files
 tags
diff --git a/util/amdfwtool/.gitignore b/util/amdfwtool/.gitignore
index 221a616c2854..cac1859b436a 100644
--- a/util/amdfwtool/.gitignore
+++ b/util/amdfwtool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 amdfwtool
diff --git a/util/archive/.gitignore b/util/archive/.gitignore
index ea0035fa2a48..f1d43c64193c 100644
--- a/util/archive/.gitignore
+++ b/util/archive/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 archive
diff --git a/util/autoport/.gitignore b/util/autoport/.gitignore
index dc8599efdc90..0069f999f610 100644
--- a/util/autoport/.gitignore
+++ b/util/autoport/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 autoport
diff --git a/util/bincfg/.gitignore b/util/bincfg/.gitignore
index ee1b39446e83..20a7c5940c84 100644
--- a/util/bincfg/.gitignore
+++ b/util/bincfg/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 bincfg
diff --git a/util/bucts/.gitignore b/util/bucts/.gitignore
index c5a4708e0f4d..f2073899094d 100644
--- a/util/bucts/.gitignore
+++ b/util/bucts/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 bucts
diff --git a/util/cbfstool/.gitignore b/util/cbfstool/.gitignore
index 28fb4b2d544d..560d7ea82766 100644
--- a/util/cbfstool/.gitignore
+++ b/util/cbfstool/.gitignore
@@ -1,5 +1,3 @@
-.dependencies
-.test
 cbfs-compression-tool
 cbfstool
 fmaptool
diff --git a/util/cbmem/.gitignore b/util/cbmem/.gitignore
index 4905bd37571d..5bc3336a1f08 100644
--- a/util/cbmem/.gitignore
+++ b/util/cbmem/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 cbmem
diff --git a/util/ectool/.gitignore b/util/ectool/.gitignore
index 67d81e4d6ead..4ceecac5ab8d 100644
--- a/util/ectool/.gitignore
+++ b/util/ectool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 ectool
diff --git a/util/futility/.gitignore b/util/futility/.gitignore
index aa3b0c76a922..1a1d4ab072e6 100644
--- a/util/futility/.gitignore
+++ b/util/futility/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 futility
diff --git a/util/genprof/.gitignore b/util/genprof/.gitignore
index 14ffbb6b1514..612ef673721b 100644
--- a/util/genprof/.gitignore
+++ b/util/genprof/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 genprof
diff --git a/util/ifdtool/.gitignore b/util/ifdtool/.gitignore
index 6cdb4236c970..ee8e8316816b 100644
--- a/util/ifdtool/.gitignore
+++ b/util/ifdtool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 ifdtool
diff --git a/util/intelmetool/.gitignore b/util/intelmetool/.gitignore
index 5de15c02cd34..ea65fca31189 100644
--- a/util/intelmetool/.gitignore
+++ b/util/intelmetool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 intelmetool
diff --git a/util/intelp2m/.gitignore b/util/intelp2m/.gitignore
index 0696ea0e1c16..c97379202976 100644
--- a/util/intelp2m/.gitignore
+++ b/util/intelp2m/.gitignore
@@ -1,4 +1,2 @@
-.dependencies
-.test
 intelp2m
 generate/gpio.h
diff --git a/util/inteltool/.gitignore b/util/inteltool/.gitignore
index 767fbcc0b86d..f2b363a19459 100644
--- a/util/inteltool/.gitignore
+++ b/util/inteltool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 inteltool
diff --git a/util/intelvbttool/.gitignore b/util/intelvbttool/.gitignore
index d4d9279835a3..61545cde9988 100644
--- a/util/intelvbttool/.gitignore
+++ b/util/intelvbttool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 intelvbttool
diff --git a/util/kbc1126/.gitignore b/util/kbc1126/.gitignore
index 9ded0a5149c0..862c2287d699 100644
--- a/util/kbc1126/.gitignore
+++ b/util/kbc1126/.gitignore
@@ -1,4 +1,2 @@
-.dependencies
-.test
 kbc1126_ec_dump
 kbc1126_ec_insert
diff --git a/util/msrtool/.gitignore b/util/msrtool/.gitignore
index 13137c663c0a..564b06c72f11 100644
--- a/util/msrtool/.gitignore
+++ b/util/msrtool/.gitignore
@@ -1,5 +1,3 @@
-.dependencies
-.test
 msrtool
 Makefile
 Makefile.deps
diff --git a/util/nvramtool/.gitignore b/util/nvramtool/.gitignore
index ab073417d770..fc4630ee9cb1 100644
--- a/util/nvramtool/.gitignore
+++ b/util/nvramtool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 nvramtool
diff --git a/util/pmh7tool/.gitignore b/util/pmh7tool/.gitignore
index 4b8dbc51c0a7..2f9e8249cde6 100644
--- a/util/pmh7tool/.gitignore
+++ b/util/pmh7tool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 pmh7tool
diff --git a/util/spd_tools/.gitignore b/util/spd_tools/.gitignore
index 5cd54134edf9..cafb8530d635 100644
--- a/util/spd_tools/.gitignore
+++ b/util/spd_tools/.gitignore
@@ -1,4 +1,2 @@
-.dependencies
-.test
 */gen_spd
 */gen_part_id
diff --git a/util/superiotool/.gitignore b/util/superiotool/.gitignore
index 566cd8452dde..63af84dbae2d 100644
--- a/util/superiotool/.gitignore
+++ b/util/superiotool/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 superiotool
diff --git a/util/vgabios/.gitignore b/util/vgabios/.gitignore
index e19a8a51b68a..b3bf197215f9 100644
--- a/util/vgabios/.gitignore
+++ b/util/vgabios/.gitignore
@@ -1,3 +1 @@
-.dependencies
-.test
 testbios