diff --git a/test/src/test_ivec2.h b/test/src/test_ivec2.h
index edcbe84..9709e21 100644
--- a/test/src/test_ivec2.h
+++ b/test/src/test_ivec2.h
@@ -62,7 +62,7 @@ TEST_IMPL(GLM_PREFIX, ivec2_dot) {
   dot1 = GLM(ivec2_dot)(a, b);
   dot2 = a[0] * b[0] + a[1] * b[1];
 
-  ASSERT(test_eq(dot1, dot2))
+  ASSERT(dot1, dot2)
   ASSERT(dot1 == 20)
 
   TEST_SUCCESS
@@ -76,7 +76,7 @@ TEST_IMPL(GLM_PREFIX, ivec2_cross) {
   cross1 = GLM(ivec2_cross)(a, b);
   cross2 = a[0] * b[1] - a[1] * b[0];
 
-  ASSERT(test_eq(cross1, cross2))
+  ASSERT(cross1, cross2)
   ASSERT(cross1 == 11)
 
   TEST_SUCCESS
@@ -161,8 +161,8 @@ TEST_IMPL(GLM_PREFIX, ivec2_div) {
   
   GLM(ivec2_div)(v1, v2, v3);
 
-  ASSERT(test_eq(v1[0] / v2[0], v3[0]))
-  ASSERT(test_eq(v1[1] / v2[1], v3[1]))
+  ASSERT(v1[0] / v2[0] == v3[0])
+  ASSERT(v1[1] / v2[1] == v3[1])
   ASSERT(v3[0] == -3)
   ASSERT(v3[1] == 1)
   
@@ -175,8 +175,8 @@ TEST_IMPL(GLM_PREFIX, ivec2_divs) {
   
   GLM(ivec2_divs)(v1, s, v2);
 
-  ASSERT(test_eq(v1[0] / s, v2[0]))
-  ASSERT(test_eq(v1[1] / s, v2[1]))
+  ASSERT(v1[0] / s == v2[0])
+  ASSERT(v1[1] / s == v2[1])
   ASSERT(v2[0] == 4)
   ASSERT(v2[1] == -2)
   
@@ -190,8 +190,8 @@ TEST_IMPL(GLM_PREFIX, ivec2_mod) {
 
   GLM(ivec2_mod)(a, b, dest);
 
-  ASSERT(test_eq(a[0] % b[0], dest[0]))
-  ASSERT(test_eq(a[1] % b[1], dest[1]))
+  ASSERT(a[0] % b[0] == dest[0])
+  ASSERT(a[1] % b[1] == dest[1])
   ASSERT(dest[0] == 1)
   ASSERT(dest[1] == -3)
 
diff --git a/test/src/test_ivec3.h b/test/src/test_ivec3.h
index 432c043..aa62771 100644
--- a/test/src/test_ivec3.h
+++ b/test/src/test_ivec3.h
@@ -61,7 +61,7 @@ TEST_IMPL(GLM_PREFIX, ivec3_dot) {
   dot1 = GLM(ivec3_dot)(a, b);
   dot2 = a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
 
-  ASSERT(test_eq(dot1, dot2))
+  ASSERT(dot1 == dot2)
   ASSERT(dot1 == 22)
 
   TEST_SUCCESS
@@ -74,7 +74,7 @@ TEST_IMPL(GLM_PREFIX, ivec3_norm2) {
   norm2_1 = GLM(ivec3_norm2)(v);
   norm2_2 = v[0] * v[0] + v[1] * v[1] + v[2] * v[2];
   
-  ASSERT(test_eq(norm2_1, norm2_2))
+  ASSERT(norm2_1 == norm2_2)
   ASSERT(norm2_1 == 29)
 
   TEST_SUCCESS
@@ -85,9 +85,9 @@ TEST_IMPL(GLM_PREFIX, ivec3_norm) {
   int norm1, norm2;
 
   norm1 = GLM(ivec3_norm)(v);
-  norm2 = (int)sqrtf(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+  norm2 = (int)sqrtf((float)(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]));
 
-  ASSERT(test_eq(norm1, norm2))
+  ASSERT(norm1 == norm2)
   ASSERT(norm1 == 5)
 
   TEST_SUCCESS
@@ -178,9 +178,9 @@ TEST_IMPL(GLM_PREFIX, ivec3_div) {
   
   GLM(ivec3_div)(v1, v2, v3);
 
-  ASSERT(test_eq(v1[0] / v2[0], v3[0]))
-  ASSERT(test_eq(v1[1] / v2[1], v3[1]))
-  ASSERT(test_eq(v1[2] / v2[2], v3[2]))
+  ASSERT(v1[0] / v2[0] == v3[0])
+  ASSERT(v1[1] / v2[1] == v3[1])
+  ASSERT(v1[2] / v2[2] == v3[2])
   ASSERT(v3[0] == -3)
   ASSERT(v3[1] == 1)
   ASSERT(v3[2] == 4)
@@ -194,9 +194,9 @@ TEST_IMPL(GLM_PREFIX, ivec3_divs) {
   
   GLM(ivec3_divs)(v1, s, v2);
 
-  ASSERT(test_eq(v1[0] / s, v2[0]))
-  ASSERT(test_eq(v1[1] / s, v2[1]))
-  ASSERT(test_eq(v1[2] / s, v2[2]))
+  ASSERT(v1[0] / s == v2[0])
+  ASSERT(v1[1] / s == v2[1])
+  ASSERT(v1[2] / s == v2[2])
   ASSERT(v2[0] == 4)
   ASSERT(v2[1] == -2)
   ASSERT(v2[2] == 3)
@@ -211,9 +211,9 @@ TEST_IMPL(GLM_PREFIX, ivec3_mod) {
 
   GLM(ivec3_mod)(a, b, dest);
 
-  ASSERT(test_eq(a[0] % b[0], dest[0]))
-  ASSERT(test_eq(a[1] % b[1], dest[1]))
-  ASSERT(test_eq(a[2] % b[2], dest[2]))
+  ASSERT(a[0] % b[0] == dest[0])
+  ASSERT(a[1] % b[1] == dest[1])
+  ASSERT(a[2] % b[2] == dest[2])
   ASSERT(dest[0] == 1)
   ASSERT(dest[1] == -3)
   ASSERT(dest[2] == 2)