diff --git a/src/arduino.cc/builder/test/ctags_runner_test.go b/src/arduino.cc/builder/test/ctags_runner_test.go
index d5a26a6d..8cb77b9e 100644
--- a/src/arduino.cc/builder/test/ctags_runner_test.go
+++ b/src/arduino.cc/builder/test/ctags_runner_test.go
@@ -271,7 +271,10 @@ func TestCTagsRunnerSketchWithTemplates(t *testing.T) {
 	}
 
 	sketchLocation = strings.Replace(sketchLocation, "\\", "\\\\", -1)
-	expectedOutput := "printGyro\t" + sketchLocation + "\t/^void printGyro()$/;\"\tkind:function\tline:10\tsignature:()\treturntype:void\n"
+	expectedOutput := "printGyro\t" + sketchLocation + "\t/^void printGyro()$/;\"\tkind:function\tline:10\tsignature:()\treturntype:void\n" +
+		"bVar\t" + sketchLocation + "\t/^c< 8 > bVar;$/;\"\tkind:variable\tline:15\n" +
+		"aVar\t" + sketchLocation + "\t/^c< 1<<8 > aVar;$/;\"\tkind:variable\tline:16\n" +
+		"func\t" + sketchLocation + "\t/^template<int X> func( c< 1<<X> & aParam) {$/;\"\tkind:function\tline:18\tsignature:( c< 1<<X> & aParam)\treturntype:template\n"
 
 	require.Equal(t, expectedOutput, strings.Replace(context[constants.CTX_CTAGS_OUTPUT].(string), "\r\n", "\n", -1))
 }
diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/src/arduino.cc/builder/test/helper_tools_downloader.go
index e8df4e20..0f3c7de9 100644
--- a/src/arduino.cc/builder/test/helper_tools_downloader.go
+++ b/src/arduino.cc/builder/test/helper_tools_downloader.go
@@ -112,13 +112,13 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 			OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/coan-5.2-x86_64-apple-darwin.zip"},
 			OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/coan-5.2-arm-linux-gnueabihf.tar.bz2"},
 		}},
-		Tool{Name: "ctags", Version: "5.8-arduino7",
+		Tool{Name: "ctags", Version: "5.8-arduino8",
 			OsUrls: []OsUrl{
-				OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-i686-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-x86_64-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-i686-mingw32.zip"},
-				OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-x86_64-apple-darwin.zip"},
-				OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-armv6-linux-gnueabihf.tar.bz2"},
+				OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino8-i686-pc-linux-gnu.tar.bz2"},
+				OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino8-x86_64-pc-linux-gnu.tar.bz2"},
+				OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino8-i686-mingw32.zip"},
+				OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino8-x86_64-apple-darwin.zip"},
+				OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino8-armv6-linux-gnueabihf.tar.bz2"},
 			}},
 	}
 
diff --git a/src/arduino.cc/builder/test/sketch_with_templates_and_shift/template_and_shift.cpp b/src/arduino.cc/builder/test/sketch_with_templates_and_shift/template_and_shift.cpp
index ce9bb444..f4f1ece8 100644
--- a/src/arduino.cc/builder/test/sketch_with_templates_and_shift/template_and_shift.cpp
+++ b/src/arduino.cc/builder/test/sketch_with_templates_and_shift/template_and_shift.cpp
@@ -10,3 +10,10 @@ template <class SomeType, template <class> class OtherType> class NestedTemplate
 void printGyro()
 {
 }
+
+template <int P> class c {};
+c< 8 > bVar;
+c< 1<<8 > aVar;
+
+template<int X> func( c< 1<<X> & aParam) {
+}