diff --git a/test/scripts/typeinfo.py b/test/scripts/typeinfo.py
index 3f3632d..ab32d90 100644
--- a/test/scripts/typeinfo.py
+++ b/test/scripts/typeinfo.py
@@ -44,5 +44,8 @@ class TypeInfoTest( unittest.TestCase ):
         var4 = pykd.typedVar( ti1, pykd.getOffset( target.moduleName, "Namespace1::Namespace2::var4" ) )
         self.assertEqual( var3.m_field1, 50 )
 
-
-
+    def testNamespace(self):
+        print "Testing templates"
+        ti3 = pykd.typeInfo( target.moduleName, "Namespace3::Class3<int>" )
+        var5 = pykd.typedVar( ti3, pykd.getOffset( target.moduleName, "Namespace3::var5" ) )
+        self.assertEqual( var5.m_field1, 4 )
diff --git a/test/targetapp/types.cpp b/test/targetapp/types.cpp
index faf59c8..85c697f 100644
--- a/test/targetapp/types.cpp
+++ b/test/targetapp/types.cpp
@@ -82,4 +82,23 @@ namespace Namespace1 {
     };
 };
 
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Namespace3
+{
+
+    template<typename T>
+    class Class3
+    {
+    public:
+        Class3(T val): m_field1 (val)
+        {
+        }
+    private:
+        T m_field1;
+    };
+    
+    Class3<int> var4(4);
+
+};
 ///////////////////////////////////////////////////////////////////////////////
\ No newline at end of file