diff --git a/Tools/CPUInfo/CPUInfo.pde b/Tools/CPUInfo/CPUInfo.pde
index a182e56844..fef8760f25 100644
--- a/Tools/CPUInfo/CPUInfo.pde
+++ b/Tools/CPUInfo/CPUInfo.pde
@@ -1,4 +1,4 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
+/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 
 /*
   test CPU speed
diff --git a/Tools/Hello/Hello.pde b/Tools/Hello/Hello.pde
index d29420ae8e..64379581e6 100644
--- a/Tools/Hello/Hello.pde
+++ b/Tools/Hello/Hello.pde
@@ -1,4 +1,4 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
+/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 
 /*
   simple hello world sketch
diff --git a/Tools/VARTest/Parameters.pde b/Tools/VARTest/Parameters.pde
index 51776a333b..5c8f124334 100644
--- a/Tools/VARTest/Parameters.pde
+++ b/Tools/VARTest/Parameters.pde
@@ -1,4 +1,4 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
+/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 
 /*
   ArduPlane parameter definitions
diff --git a/Tools/VARTest/VARTest.pde b/Tools/VARTest/VARTest.pde
index 2f82531fa2..65dda09c43 100644
--- a/Tools/VARTest/VARTest.pde
+++ b/Tools/VARTest/VARTest.pde
@@ -1,4 +1,4 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
+/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 
 /*
   new variable scheme