diff --git a/tests/affine2.rs b/tests/affine2.rs
index 1e621c1e..a2dfaaca 100644
--- a/tests/affine2.rs
+++ b/tests/affine2.rs
@@ -174,8 +174,7 @@ mod affine2 {
     #[test]
     fn test_align() {
         use std::mem;
-        // TODO: With SSE2 Mat2/Affine2 is 16 byte aligned. Should this be true when no SSE2?
-        if cfg!(all(target_feature = "sse2", not(feature = "scalar-math"))) {
+        if cfg!(not(feature = "scalar-math")) {
             assert_eq!(32, mem::size_of::<Affine2>());
             assert_eq!(16, mem::align_of::<Affine2>());
         } else {
diff --git a/tests/vec4.rs b/tests/vec4.rs
index 8d354348..8f69a534 100644
--- a/tests/vec4.rs
+++ b/tests/vec4.rs
@@ -830,14 +830,17 @@ mod vec4 {
     fn test_align() {
         use std::mem;
         assert_eq!(16, mem::size_of::<Vec4>());
-        if cfg!(any(not(target_feature = "sse2"), feature = "scalar-math")) {
-            assert_eq!(4, mem::align_of::<Vec4>());
-            assert_eq!(4, mem::size_of::<Vec4Mask>());
-            assert_eq!(1, mem::align_of::<Vec4Mask>());
-        } else {
+        if cfg!(not(feature = "scalar-math")) {
             assert_eq!(16, mem::align_of::<Vec4>());
+        } else {
+            assert_eq!(4, mem::align_of::<Vec4>());
+        }
+        if cfg!(all(target_feature = "sse2", not(feature = "scalar-math"))) {
             assert_eq!(16, mem::size_of::<Vec4Mask>());
             assert_eq!(16, mem::align_of::<Vec4Mask>());
+        } else {
+            assert_eq!(4, mem::size_of::<Vec4Mask>());
+            assert_eq!(1, mem::align_of::<Vec4Mask>());
         }
     }