diff --git a/crypto/src/main/java/dev/openrs2/crypto/Xtea.kt b/crypto/src/main/java/dev/openrs2/crypto/Xtea.kt
index a959a40b..672aa68e 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/Xtea.kt
+++ b/crypto/src/main/java/dev/openrs2/crypto/Xtea.kt
@@ -10,7 +10,7 @@ private const val BLOCK_SIZE_MASK = BLOCK_SIZE - 1
 fun ByteBuf.xteaEncrypt(index: Int, length: Int, key: IntArray) {
     require(key.size == 4)
 
-    val end = (index + length) and BLOCK_SIZE_MASK.inv()
+    val end = index + (length and BLOCK_SIZE_MASK.inv())
     for (i in index until end step BLOCK_SIZE) {
         var sum = 0
         var v0 = getInt(i)
@@ -30,7 +30,7 @@ fun ByteBuf.xteaEncrypt(index: Int, length: Int, key: IntArray) {
 fun ByteBuf.xteaDecrypt(index: Int, length: Int, key: IntArray) {
     require(key.size == 4)
 
-    val end = (index + length) and BLOCK_SIZE_MASK.inv()
+    val end = index + (length and BLOCK_SIZE_MASK.inv())
     for (i in index until end step BLOCK_SIZE) {
         @Suppress("INTEGER_OVERFLOW")
         var sum = GOLDEN_RATIO * ROUNDS
diff --git a/crypto/src/test/java/dev/openrs2/crypto/XteaTest.kt b/crypto/src/test/java/dev/openrs2/crypto/XteaTest.kt
index a242fdc8..267809fc 100644
--- a/crypto/src/test/java/dev/openrs2/crypto/XteaTest.kt
+++ b/crypto/src/test/java/dev/openrs2/crypto/XteaTest.kt
@@ -28,31 +28,31 @@ object XteaTest {
 
         // two blocks
         TestVector("00000000000000000000000000000000", "70e1225d6e4e76554141414141414141",
-            "4141414141414141ed23375a821a8c2d"),
-
-        // not a multiple of the block size
-        TestVector("00000000000000000000000000000000", "01", "01"),
-        TestVector("00000000000000000000000000000000", "01020304050607", "01020304050607"),
-        TestVector("00000000000000000000000000000000", "70e1225d6e4e765501", "414141414141414101"),
-        TestVector("00000000000000000000000000000000", "70e1225d6e4e765501020304050607",
-            "414141414141414101020304050607")
+            "4141414141414141ed23375a821a8c2d")
     )
 
     @Test
     fun testEncrypt() {
         for (vector in TEST_VECTORS) {
-            val buffer = Unpooled.copiedBuffer(vector.plaintext)
-            try {
-                buffer.xteaEncrypt(0, buffer.readableBytes(), vector.key)
+            for (i in 0..7) {
+                for (j in 0..7) {
+                    val header = ByteArray(i) { it.toByte() }
+                    val trailer = ByteArray(j) { it.toByte() }
+
+                    val buffer = Unpooled.copiedBuffer(header, vector.plaintext, trailer)
+                    try {
+                        buffer.xteaEncrypt(i, vector.plaintext.size, vector.key)
 
-                val expected = Unpooled.wrappedBuffer(vector.ciphertext)
-                try {
-                    assertEquals(expected, buffer)
-                } finally {
-                    expected.release()
+                        val expected = Unpooled.wrappedBuffer(header, vector.ciphertext, trailer)
+                        try {
+                            assertEquals(expected, buffer)
+                        } finally {
+                            expected.release()
+                        }
+                    } finally {
+                        buffer.release()
+                    }
                 }
-            } finally {
-                buffer.release()
             }
         }
     }
@@ -60,18 +60,25 @@ object XteaTest {
     @Test
     fun testDecrypt() {
         for (vector in TEST_VECTORS) {
-            val buffer = Unpooled.copiedBuffer(vector.ciphertext)
-            try {
-                buffer.xteaDecrypt(0, buffer.readableBytes(), vector.key)
+            for (i in 0..7) {
+                for (j in 0..7) {
+                    val header = ByteArray(i) { it.toByte() }
+                    val trailer = ByteArray(j) { it.toByte() }
+
+                    val buffer = Unpooled.copiedBuffer(header, vector.ciphertext, trailer)
+                    try {
+                        buffer.xteaDecrypt(i, vector.ciphertext.size, vector.key)
 
-                val expected = Unpooled.wrappedBuffer(vector.plaintext)
-                try {
-                    assertEquals(expected, buffer)
-                } finally {
-                    expected.release()
+                        val expected = Unpooled.wrappedBuffer(header, vector.plaintext, trailer)
+                        try {
+                            assertEquals(expected, buffer)
+                        } finally {
+                            expected.release()
+                        }
+                    } finally {
+                        buffer.release()
+                    }
                 }
-            } finally {
-                buffer.release()
             }
         }
     }