diff --git a/test/build.xml b/test/build.xml
index 0ebe61fdf03c21d93ccdcf9eb7c960d8864374c8..c9e8c126dcd7d1c8502c59bc8c969b288d5e06ab 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -162,7 +162,6 @@
     <ant antfile="${test.conform}/adviceadapter.xml" inheritRefs="true"/>
     <ant antfile="${test.conform}/analyzeradapter.xml" inheritRefs="true"/>
     <ant antfile="${test.conform}/annotations.xml" inheritRefs="true"/>
-    <ant antfile="${test.conform}/jsrinlineradapter.xml" inheritRefs="true"/>
     <ant antfile="${test.conform}/localvariablessorter.xml" inheritRefs="true"/>
     <ant antfile="${test.conform}/localvariablessorter2.xml" inheritRefs="true"/>
     <ant antfile="${test.conform}/classremapper.xml" inheritRefs="true"/>
diff --git a/test/conform/jsrinlineradapter.xml b/test/conform/jsrinlineradapter.xml
deleted file mode 100644
index 661d86b03cbc83301bbb0f4dd17e3d3881593ca6..0000000000000000000000000000000000000000
--- a/test/conform/jsrinlineradapter.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
- ! ASM: a very small and fast Java bytecode manipulation framework
- ! Copyright (c) 2000-2011 INRIA, France Telecom
- ! All rights reserved.
- !
- ! Redistribution and use in source and binary forms, with or without
- ! modification, are permitted provided that the following conditions
- ! are met:
- ! 1. Redistributions of source code must retain the above copyright
- !    notice, this list of conditions and the following disclaimer.
- ! 2. 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.
- ! 3. Neither the name of the copyright holders 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.
--->
-
-<project name="conform" default="test">
-
-  <target name="test">
-    <junit fork="yes" 
-           printsummary="yes"
-           errorproperty="test.failed"
-           failureproperty="test.failed">
-      <batchtest fork="yes" todir="${out.test}/reports">
-        <fileset dir="${test}/conform">
-          <include name="**/JSRInlinerAdapterTest.java"/>
-          <include name="**/JSRInlinerAdapterUnitTest.java"/>
-        </fileset>
-      </batchtest>
-      <formatter type="xml"/>
-      <classpath refid="test.classpath"/>
-      <jvmarg value="-Dasm.test=${asm.test}"/>
-      <jvmarg value="-Dasm.test.class=${asm.test.class}"/>
-    </junit>  
-  </target>
-
-</project>
diff --git a/test/conform/org/objectweb/asm/commons/JSRInlinerAdapterTest.java b/test/conform/org/objectweb/asm/commons/JSRInlinerAdapterTest.java
index b79f92d69f7d5b8cdc683ffb547c13370f234d40..a60ec2f54ff0bb4e4c17a1fcd3be70801fa8f12f 100644
--- a/test/conform/org/objectweb/asm/commons/JSRInlinerAdapterTest.java
+++ b/test/conform/org/objectweb/asm/commons/JSRInlinerAdapterTest.java
@@ -27,35 +27,38 @@
 // THE POSSIBILITY OF SUCH DAMAGE.
 package org.objectweb.asm.commons;
 
-import junit.framework.TestSuite;
+import static org.junit.Assert.assertTrue;
 
-import org.objectweb.asm.AbstractTest;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runners.Parameterized.Parameters;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.test.AsmTest;
 
 /**
  * JSRInliner tests.
  *
  * @author Eric Bruneton
  */
-public class JSRInlinerAdapterTest extends AbstractTest {
-
-  private static final TestClassLoader LOADER = new TestClassLoader();
+public class JSRInlinerAdapterTest extends AsmTest {
 
-  public static TestSuite suite() throws Exception {
-    return new JSRInlinerAdapterTest().getSuite();
+  /** @return test parameters to test all the precompiled classes with ASM6. */
+  @Parameters(name = NAME)
+  public static Collection<Object[]> data() {
+    return data(Api.ASM6);
   }
 
-  @Override
-  public void test() throws Exception {
-    ClassReader cr = new ClassReader(is);
-    ClassWriter cw = new ClassWriter(0);
-    cr.accept(
-        new ClassVisitor(Opcodes.ASM5, cw) {
-
+  /** Tests that classes transformed with JSRInlinerAdapter can be loaded and instantiated. */
+  @Test
+  public void testInlineJsrAndInstantiate() {
+    ClassReader classReader = new ClassReader(classParameter.getBytes());
+    ClassWriter classWriter = new ClassWriter(0);
+    classReader.accept(
+        new ClassVisitor(apiParameter.value(), classWriter) {
           @Override
           public MethodVisitor visitMethod(
               final int access,
@@ -64,25 +67,13 @@ public class JSRInlinerAdapterTest extends AbstractTest {
               final String signature,
               final String[] exceptions) {
             MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
-            return new JSRInlinerAdapter(mv, access, name, desc, signature, exceptions);
+            return new JSRInlinerAdapter(api, mv, access, name, desc, signature, exceptions);
           }
         },
         0);
-    byte[] b = cw.toByteArray();
-    try {
-      LOADER.defineClass(n, b);
-    } catch (ClassFormatError cfe) {
-      fail(cfe.getMessage());
-    } catch (Throwable ignored) {
-    }
-  }
-
-  // ------------------------------------------------------------------------
-
-  static class TestClassLoader extends ClassLoader {
-
-    public Class<?> defineClass(final String name, final byte[] b) {
-      return defineClass(name, b, 0, b.length);
+    if (classParameter.isMoreRecentThanCurrentJdk()) {
+      thrown.expect(UnsupportedClassVersionError.class);
     }
+    assertTrue(loadAndInstantiate(classParameter.getName(), classWriter.toByteArray()));
   }
 }
diff --git a/test/conform/unit.xml b/test/conform/unit.xml
index a20726554d61e0f834f7a8803726d2cac7090d53..5a1555497cf5da5c743d3fe59accc4deb2aa7736 100644
--- a/test/conform/unit.xml
+++ b/test/conform/unit.xml
@@ -46,6 +46,7 @@
           <include name="org/objectweb/asm/TypePathTest.java"/>
           <include name="org/objectweb/asm/TypeTest.java"/>
           <include name="org/objectweb/asm/commons/CodeSizeEvaluatorTest.java"/>
+          <include name="org/objectweb/asm/commons/JSRInlinerAdapterTest.java"/>
           <include name="org/objectweb/asm/signature/SignatureReaderTest.java"/>
           <include name="org/objectweb/asm/signature/SignatureWriterTest.java"/>
           <include name="org/objectweb/asm/test/AsmTestTest.java"/>