diff --git a/glm/gtc/ulp.inl b/glm/gtc/ulp.inl
index 880d48036..0087e4447 100644
--- a/glm/gtc/ulp.inl
+++ b/glm/gtc/ulp.inl
@@ -255,7 +255,7 @@ namespace glm
 	GLM_FUNC_QUALIFIER vecType<T, P> next_float(vecType<T, P> const & x, vecType<uint, P> const & ulps)
 	{
 		vecType<T, P> Result;
-		for(uint i = 0; i < Result.length(); ++i)
+		for(length_t i = 0; i < Result.length(); ++i)
 			Result[i] = next_float(x[i], ulps[i]);
 		return Result;
 	}
diff --git a/test/core/core_type_mat2x2.cpp b/test/core/core_type_mat2x2.cpp
index d65d0ce8f..5cdf36a5a 100644
--- a/test/core/core_type_mat2x2.cpp
+++ b/test/core/core_type_mat2x2.cpp
@@ -72,10 +72,10 @@ int test_ctr()
 		{0, 1},
 		{2, 3}};
 
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 
 	std::vector<glm::mat2x2> v1{
diff --git a/test/core/core_type_mat2x3.cpp b/test/core/core_type_mat2x3.cpp
index 24847f7ca..c0d1c0132 100644
--- a/test/core/core_type_mat2x3.cpp
+++ b/test/core/core_type_mat2x3.cpp
@@ -46,10 +46,10 @@ int test_ctr()
 		{0, 1, 2},
 		{3, 4, 5}};
 	
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 	
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 	
 	std::vector<glm::mat2x3> v1{
diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp
index 8f7e1408b..c133348bf 100644
--- a/test/core/core_type_mat2x4.cpp
+++ b/test/core/core_type_mat2x4.cpp
@@ -46,10 +46,10 @@ int test_ctr()
 		{0, 1, 2, 3},
 		{4, 5, 6, 7}};
 	
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 	
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 	
 	std::vector<glm::mat2x4> v1{
diff --git a/test/core/core_type_mat3x2.cpp b/test/core/core_type_mat3x2.cpp
index facf3f146..38d198145 100644
--- a/test/core/core_type_mat3x2.cpp
+++ b/test/core/core_type_mat3x2.cpp
@@ -48,10 +48,10 @@ int test_ctr()
 		{2, 3},
 		{4, 5}};
 	
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 	
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 	
 	std::vector<glm::mat3x2> v1{
diff --git a/test/core/core_type_mat3x3.cpp b/test/core/core_type_mat3x3.cpp
index 7599cec4f..f0f6171c8 100644
--- a/test/core/core_type_mat3x3.cpp
+++ b/test/core/core_type_mat3x3.cpp
@@ -107,10 +107,10 @@ int test_ctr()
 		{3, 4, 5},
 		{6, 7, 8}};
 	
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 	
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 	
 	std::vector<glm::mat3x3> v1{
diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp
index 793e84fc0..1598fcc75 100644
--- a/test/core/core_type_mat3x4.cpp
+++ b/test/core/core_type_mat3x4.cpp
@@ -48,10 +48,10 @@ int test_ctr()
 		{4, 5, 6, 7},
 		{8, 9, 10, 11}};
 	
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 	
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 	
 	std::vector<glm::mat3x4> v1{
diff --git a/test/core/core_type_mat4x2.cpp b/test/core/core_type_mat4x2.cpp
index 4b7a79a99..4df38a9ff 100644
--- a/test/core/core_type_mat4x2.cpp
+++ b/test/core/core_type_mat4x2.cpp
@@ -50,10 +50,10 @@ int test_ctr()
 		{4, 5},
 		{6, 7}};
 
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 
 	std::vector<glm::mat4x2> v1{
diff --git a/test/core/core_type_mat4x3.cpp b/test/core/core_type_mat4x3.cpp
index 639592f41..7e7500d80 100644
--- a/test/core/core_type_mat4x3.cpp
+++ b/test/core/core_type_mat4x3.cpp
@@ -50,10 +50,10 @@ int test_ctr()
 		{6, 7, 8},
 		{9, 10, 11}};
 
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 
 	std::vector<glm::mat4x3> v1{
diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp
index bc524f82c..704e83d93 100644
--- a/test/core/core_type_mat4x4.cpp
+++ b/test/core/core_type_mat4x4.cpp
@@ -208,10 +208,10 @@ int test_ctr()
 		{8, 9, 10, 11},
 		{12, 13, 14, 15}};
 
-	for(int i = 0; i < m0.length(); ++i)
+	for(glm::length_t i = 0; i < m0.length(); ++i)
 		Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
 
-	for(int i = 0; i < m1.length(); ++i)
+	for(glm::length_t i = 0; i < m1.length(); ++i)
 		Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
 
 	std::vector<glm::mat4> m3{