diff --git a/src/main/java/com/thealgorithms/ciphers/Caesar.java b/src/main/java/com/thealgorithms/ciphers/Caesar.java
index 23535bc2b5d2..7a5e70e6eb78 100644
--- a/src/main/java/com/thealgorithms/ciphers/Caesar.java
+++ b/src/main/java/com/thealgorithms/ciphers/Caesar.java
@@ -9,8 +9,8 @@
  * @author khalil2535
  */
 public class Caesar {
-    private static char normalizeShift(final int shift) {
-        return (char) (shift % 26);
+    private static int normalizeShift(final int shift) {
+        return ((shift % 26) + 26) % 26;
     }
 
     /**
@@ -22,21 +22,18 @@ private static char normalizeShift(final int shift) {
     public String encode(String message, int shift) {
         StringBuilder encoded = new StringBuilder();
 
-        final char shiftChar = normalizeShift(shift);
+        final int shiftChar = normalizeShift(shift);
 
         final int length = message.length();
         for (int i = 0; i < length; i++) {
-            //            int current = message.charAt(i); //using char to shift characters because
-            //            ascii
-            // is in-order latin alphabet
-            char current = message.charAt(i); // Java law : char + int = char
+            final char current = message.charAt(i);
 
             if (isCapitalLatinLetter(current)) {
-                current += shiftChar;
-                encoded.append((char) (current > 'Z' ? current - 26 : current)); // 26 = number of latin letters
+                final int shifted = current + shiftChar;
+                encoded.append((char) (shifted > 'Z' ? shifted - 26 : shifted)); // 26 = number of latin letters
             } else if (isSmallLatinLetter(current)) {
-                current += shiftChar;
-                encoded.append((char) (current > 'z' ? current - 26 : current)); // 26 = number of latin letters
+                final int shifted = current + shiftChar;
+                encoded.append((char) (shifted > 'z' ? shifted - 26 : shifted)); // 26 = number of latin letters
             } else {
                 encoded.append(current);
             }
@@ -53,17 +50,17 @@ public String encode(String message, int shift) {
     public String decode(String encryptedMessage, int shift) {
         StringBuilder decoded = new StringBuilder();
 
-        final char shiftChar = normalizeShift(shift);
+        final int shiftChar = normalizeShift(shift);
 
         final int length = encryptedMessage.length();
         for (int i = 0; i < length; i++) {
-            char current = encryptedMessage.charAt(i);
+            final char current = encryptedMessage.charAt(i);
             if (isCapitalLatinLetter(current)) {
-                current -= shiftChar;
-                decoded.append((char) (current < 'A' ? current + 26 : current)); // 26 = number of latin letters
+                final int shifted = current - shiftChar;
+                decoded.append((char) (shifted < 'A' ? shifted + 26 : shifted)); // 26 = number of latin letters
             } else if (isSmallLatinLetter(current)) {
-                current -= shiftChar;
-                decoded.append((char) (current < 'a' ? current + 26 : current)); // 26 = number of latin letters
+                final int shifted = current - shiftChar;
+                decoded.append((char) (shifted < 'a' ? shifted + 26 : shifted)); // 26 = number of latin letters
             } else {
                 decoded.append(current);
             }
diff --git a/src/test/java/com/thealgorithms/ciphers/CaesarTest.java b/src/test/java/com/thealgorithms/ciphers/CaesarTest.java
index 7aa41c4cf423..c8b20ad8d8f9 100644
--- a/src/test/java/com/thealgorithms/ciphers/CaesarTest.java
+++ b/src/test/java/com/thealgorithms/ciphers/CaesarTest.java
@@ -32,6 +32,29 @@ void caesarDecryptTest() {
         assertEquals("Encrypt this text", cipherText);
     }
 
+    @Test
+    void caesarEncryptWithNegativeShiftTest() {
+        // a shift of -1 must wrap 'A' backwards to 'Z', like a shift of +25 would
+        assertEquals("Z", caesar.encode("A", -1));
+        assertEquals("z", caesar.encode("a", -1));
+        assertEquals("EBIIL", caesar.encode("HELLO", -3));
+    }
+
+    @Test
+    void caesarDecryptWithNegativeShiftTest() {
+        assertEquals("A", caesar.decode("Z", -1));
+        assertEquals("HELLO", caesar.decode("EBIIL", -3));
+    }
+
+    @Test
+    void caesarNegativeShiftRoundTripTest() {
+        // encode followed by decode with the same shift must return the original text
+        for (int shift : new int[] {-1, -5, -25, -26, -27, -52}) {
+            String message = "The quick brown Fox";
+            assertEquals(message, caesar.decode(caesar.encode(message, shift), shift));
+        }
+    }
+
     @Test
     void caesarBruteForce() {
         // given