diff --git a/testbufferoverrun.cpp b/testbufferoverrun.cpp
index 517ac6046..bb2ebc05b 100644
--- a/testbufferoverrun.cpp
+++ b/testbufferoverrun.cpp
@@ -52,6 +52,8 @@ private:
         // Check for memory leaks..
         ShowAll = true;
         CheckBufferOverrun();
+
+        DeallocateTokens();
     }
 
     void run()
diff --git a/testcharvar.cpp b/testcharvar.cpp
index c9b665362..d4c51c6fd 100644
--- a/testcharvar.cpp
+++ b/testcharvar.cpp
@@ -57,6 +57,8 @@ private:
         // Check for memory leaks..
         ShowAll = true;
         CheckCharVariable();
+
+        DeallocateTokens();
     }
 
     void array_index()
diff --git a/testconstructors.cpp b/testconstructors.cpp
index dcd349a63..6e6c0e853 100644
--- a/testconstructors.cpp
+++ b/testconstructors.cpp
@@ -46,6 +46,8 @@ private:
 
         // Check for memory leaks..
         CheckConstructors();
+
+        DeallocateTokens();
     }
 
     void run()
diff --git a/testdivision.cpp b/testdivision.cpp
index 15eb97d22..f199d4a7b 100644
--- a/testdivision.cpp
+++ b/testdivision.cpp
@@ -51,6 +51,8 @@ private:
         // Check for memory leaks..
         ShowAll = true;
         CheckUnsignedDivision();
+
+        DeallocateTokens();
     }
 
     void run()
diff --git a/testmemleak.cpp b/testmemleak.cpp
index 86039e528..a7ad540b4 100644
--- a/testmemleak.cpp
+++ b/testmemleak.cpp
@@ -49,6 +49,8 @@ private:
         // Check for memory leaks..
         ShowAll = false;
         CheckMemoryLeak();
+
+        DeallocateTokens();
     }
 
     void run()
diff --git a/testother.cpp b/testother.cpp
index b5135c267..43b88c33c 100644
--- a/testother.cpp
+++ b/testother.cpp
@@ -48,6 +48,8 @@ private:
 
         // Check for unused variables..
         CheckIncompleteStatement();
+
+        DeallocateTokens();
     }
 
     void run()
diff --git a/testunusedvar.cpp b/testunusedvar.cpp
index cdcdb827e..21d70160a 100644
--- a/testunusedvar.cpp
+++ b/testunusedvar.cpp
@@ -48,6 +48,8 @@ private:
 
         // Check for unused variables..
         CheckStructMemberUsage();
+
+        DeallocateTokens();
     }
 
     void run()