diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
index 519aba32964..5e44688939c 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
@@ -4189,7 +4189,8 @@ public class AST2TemplateTests extends AST2BaseTest {
 		parseAndCheckBindings();
 	}
 
-	//	template <unsigned int N>
+	//	typedef unsigned int uint;
+	//	template <uint N>
 	//	void S(int (&array)[N]);
 	//
 	//	int a[1];
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
index a4c5e01e981..fb683e6602c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
@@ -202,9 +202,7 @@ public class TemplateArgumentDeduction {
 						IType type2= arg.getTypeOfNonTypeValue();
 						// Template-argument deduced from an array bound may be of any integral
 						// type.
-						if (type2 instanceof TypeOfValueDeducedFromArraySize &&
-								type1 instanceof IBasicType &&
-								((IBasicType) type1).getKind() == IBasicType.Kind.eInt) {
+						if (type2 instanceof TypeOfValueDeducedFromArraySize && isIntegerType(type1)) {
 							arg = new CPPTemplateNonTypeArgument(arg.getNonTypeValue(), type1);
 							deduct.fDeducedArgs.put(tpar, arg);
 						} else if (!type1.isSameType(type2)) {
@@ -220,11 +218,18 @@ public class TemplateArgumentDeduction {
 		return false;
 	}
 
-	private static boolean deduceFromFunctionArg(IType par, IType arg, ValueCategory valueCat, TemplateArgumentDeduction deduct, IASTNode point) throws DOMException {
+	private static boolean isIntegerType(IType type) {
+		type = SemanticUtil.getNestedType(type, SemanticUtil.TDEF);
+		return type instanceof IBasicType && ((IBasicType) type).getKind() == IBasicType.Kind.eInt;
+	}
+
+	private static boolean deduceFromFunctionArg(IType par, IType arg, ValueCategory valueCat,
+			TemplateArgumentDeduction deduct, IASTNode point) throws DOMException {
 		boolean isReferenceTypeParameter= false;
 		if (par instanceof ICPPReferenceType) {
-			// If P is an rvalue reference to a cv-unqualified template parameter and the argument is an
-			// lvalue, the type "lvalue reference to A" is used in place of A for type deduction.
+			// If P is an rvalue reference to a cv-unqualified template parameter and the argument
+			// is an lvalue, the type "lvalue reference to A" is used in place of A for type
+			// deduction.
 			isReferenceTypeParameter= true;
 			final ICPPReferenceType refPar = (ICPPReferenceType) par;
 			if (refPar.isRValueReference() && refPar.getType() instanceof ICPPTemplateParameter &&