diff --git a/src/test/smali/junit-tests/InstructionTests/Format21s/Format21s.smali b/src/test/smali/junit-tests/InstructionTests/Format21s/Format21s.smali
new file mode 100644
index 00000000..8337807a
--- /dev/null
+++ b/src/test/smali/junit-tests/InstructionTests/Format21s/Format21s.smali
@@ -0,0 +1,33 @@
+.class public LFormat21s;
+.super Ljava/lang/Object;
+.source "Format21s.smali"
+
+.method public constructor <init>()V
+    .registers 1
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
+
+.method public test_const-16()V
+    .registers 2
+    .annotation runtime Lorg/junit/Test;
+    .end annotation
+
+    const/16 v0, 15000
+
+    const v1, 15000
+    invoke-static {v0, v1}, LAssert;->assertEquals(II)V
+    return-void
+.end method
+
+.method public test_const-wide-16()V
+    .registers 4
+    .annotation runtime Lorg/junit/Test;
+    .end annotation
+
+    const-wide/16 v0, 15000
+
+    const-wide v2, 15000
+    invoke-static {v0, v1, v2, v3}, Lorg/junit/Assert;->assertEquals(JJ)V
+    return-void
+.end method
\ No newline at end of file
diff --git a/src/test/smali/junit-tests/TestSuite.smali b/src/test/smali/junit-tests/TestSuite.smali
index ec72d8b4..f031d263 100644
--- a/src/test/smali/junit-tests/TestSuite.smali
+++ b/src/test/smali/junit-tests/TestSuite.smali
@@ -28,6 +28,7 @@
                 LFormat11x;,
                 LFormat12x;,
                 LFormat20t;,
+                LFormat21s;,
                 LFormat21t;,
                 LFormat22x;,
                 LFormat30t;