diff --git a/baksmali/src/test/java/org/jf/baksmali/InstructionRoundtripTest.java b/baksmali/src/test/java/org/jf/baksmali/InstructionRoundtripTest.java
new file mode 100644
index 00000000..780631ba
--- /dev/null
+++ b/baksmali/src/test/java/org/jf/baksmali/InstructionRoundtripTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.baksmali;
+
+import org.junit.Test;
+
+public class InstructionRoundtripTest extends IdenticalRoundtripTest {
+    @Test
+    public void testConstMethodHandle() {
+        BaksmaliOptions options = new BaksmaliOptions();
+        options.apiLevel = 28;
+        runTest("ConstMethodHandle", options);
+    }
+
+    @Test
+    public void testConstMethodType() {
+        BaksmaliOptions options = new BaksmaliOptions();
+        options.apiLevel = 28;
+        runTest("ConstMethodType", options);
+    }
+}
diff --git a/baksmali/src/test/resources/InstructionRoundtripTest/ConstMethodHandle.smali b/baksmali/src/test/resources/InstructionRoundtripTest/ConstMethodHandle.smali
new file mode 100644
index 00000000..13cf9837
--- /dev/null
+++ b/baksmali/src/test/resources/InstructionRoundtripTest/ConstMethodHandle.smali
@@ -0,0 +1,30 @@
+.class LConstMethodHandle;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static staticField:Ljava/lang/Object;
+
+
+# instance fields
+.field public instanceField:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constMethodHandle()V
+    .registers 15
+
+    const-method-handle v0, static-invoke@Ljava/lang/Integer;->toString(I)Ljava/lang/String;
+
+    const-method-handle v0, instance-invoke@Ljava/lang/Integer;->toString()Ljava/lang/String;
+
+    const-method-handle v0, static-put@LConstMethodHandle;->instanceField:Ljava/lang/Object;
+
+    const-method-handle v0, static-put@LConstMethodHandle;->instanceField:Ljava/lang/Object;
+
+    const-method-handle v0, static-put@LConstMethodHandle;->staticField:Ljava/lang/Object;
+
+    const-method-handle v0, static-put@LConstMethodHandle;->staticField:Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/baksmali/src/test/resources/InstructionRoundtripTest/ConstMethodType.smali b/baksmali/src/test/resources/InstructionRoundtripTest/ConstMethodType.smali
new file mode 100644
index 00000000..17f28898
--- /dev/null
+++ b/baksmali/src/test/resources/InstructionRoundtripTest/ConstMethodType.smali
@@ -0,0 +1,24 @@
+.class LConstMethodType;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static staticField:Ljava/lang/Object;
+
+
+# instance fields
+.field public instanceField:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constMethodHandle()V
+    .registers 15
+
+    const-method-type v0, ()V
+
+    const-method-type v0, (II)I
+
+    const-method-type v0, (Ljava/lang/String;)Ljava/lang/String;
+
+    return-void
+.end method