diff --git a/test/build.xml b/test/build.xml
index 0ebe61fdf03c21d93ccdcf9eb7c960d8864374c8..8426d3499102f16ee10d4508b8215d2d2b980d52 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -161,7 +161,6 @@
   <target name="testConform" depends="compile" if="test-conform">
     <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"/>
diff --git a/test/conform/annotations.xml b/test/conform/annotations.xml
deleted file mode 100644
index 791ac99693fe094d0caa9028d7c6b2620eaff27a..0000000000000000000000000000000000000000
--- a/test/conform/annotations.xml
+++ /dev/null
@@ -1,50 +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="**/AnnotationsTest.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/AnnotationsTest.java b/test/conform/org/objectweb/asm/AnnotationVisitorTest.java
similarity index 70%
rename from test/conform/org/objectweb/asm/AnnotationsTest.java
rename to test/conform/org/objectweb/asm/AnnotationVisitorTest.java
index c1772bad8f81b16db6bd3ec40a08960510192b0b..bba45296cff21eaeb23c4d339282c32128e38d0b 100644
--- a/test/conform/org/objectweb/asm/AnnotationsTest.java
+++ b/test/conform/org/objectweb/asm/AnnotationVisitorTest.java
@@ -27,33 +27,46 @@
 // THE POSSIBILITY OF SUCH DAMAGE.
 package org.objectweb.asm;
 
-import junit.framework.TestSuite;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runners.Parameterized.Parameters;
+import org.objectweb.asm.test.AsmTest;
 
 /**
- * Annotations tests.
+ * AnnotationVisitor tests.
  *
  * @author Eric Bruneton
  */
-public class AnnotationsTest extends AbstractTest {
+public class AnnotationVisitorTest extends AsmTest {
 
-  public static TestSuite suite() throws Exception {
-    return new AnnotationsTest().getSuite();
+  /** @return test parameters to test all the precompiled classes with all the apis. */
+  @Parameters(name = NAME)
+  public static Collection<Object[]> data() {
+    return data(Api.ASM4, Api.ASM5, Api.ASM6);
   }
 
-  @Override
-  public void test() throws Exception {
-    ClassReader cr = new ClassReader(is);
-    ClassWriter cw1 = new ClassWriter(0);
-    ClassWriter cw2 = new ClassWriter(0);
-    cr.accept(new RemoveAnnotationsAdapter1(cw1), 0);
-    cr.accept(new RemoveAnnotationsAdapter2(cw2), 0);
-    assertEquals(new ClassReader(cw2.toByteArray()), new ClassReader(cw1.toByteArray()));
+  /**
+   * Tests that ClassReader accepts visitor which return null AnnotationVisitor, and that returning
+   * null AnnotationVisitor is equivalent to returning an EmptyAnnotationVisitor.
+   */
+  @Test
+  public void testRemoveOrDelete() {
+    ClassReader classReader = new ClassReader(classParameter.getBytes());
+    ClassWriter classWriter1 = new ClassWriter(0);
+    ClassWriter classWriter2 = new ClassWriter(0);
+    if (classParameter.isMoreRecentThan(apiParameter)) {
+      thrown.expect(RuntimeException.class);
+    }
+    classReader.accept(new RemoveAnnotationsAdapter(apiParameter.value(), classWriter1), 0);
+    classReader.accept(new DeleteAnnotationsAdapter(apiParameter.value(), classWriter2), 0);
+    assertThatClass(classWriter1.toByteArray()).isEqualTo(classWriter2.toByteArray());
   }
 
   static class EmptyAnnotationVisitor extends AnnotationVisitor {
 
-    public EmptyAnnotationVisitor() {
-      super(Opcodes.ASM5);
+    public EmptyAnnotationVisitor(final int api) {
+      super(api);
     }
 
     @Override
@@ -67,21 +80,21 @@ public class AnnotationsTest extends AbstractTest {
     }
   }
 
-  static class RemoveAnnotationsAdapter1 extends ClassVisitor {
+  static class RemoveAnnotationsAdapter extends ClassVisitor {
 
-    public RemoveAnnotationsAdapter1(final ClassVisitor cv) {
-      super(Opcodes.ASM5, cv);
+    public RemoveAnnotationsAdapter(final int api, final ClassVisitor cv) {
+      super(api, cv);
     }
 
     @Override
     public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
-      return new EmptyAnnotationVisitor();
+      return new EmptyAnnotationVisitor(api);
     }
 
     @Override
     public AnnotationVisitor visitTypeAnnotation(
         int typeRef, TypePath typePath, String desc, boolean visible) {
-      return new EmptyAnnotationVisitor();
+      return new EmptyAnnotationVisitor(api);
     }
 
     @Override
@@ -91,41 +104,40 @@ public class AnnotationsTest extends AbstractTest {
         final String desc,
         final String signature,
         final String[] exceptions) {
-      return new MethodVisitor(
-          Opcodes.ASM5, cv.visitMethod(access, name, desc, signature, exceptions)) {
+      return new MethodVisitor(api, cv.visitMethod(access, name, desc, signature, exceptions)) {
 
         @Override
         public AnnotationVisitor visitAnnotationDefault() {
-          return new EmptyAnnotationVisitor();
+          return new EmptyAnnotationVisitor(api);
         }
 
         @Override
         public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-          return new EmptyAnnotationVisitor();
+          return new EmptyAnnotationVisitor(api);
         }
 
         @Override
         public AnnotationVisitor visitTypeAnnotation(
             int typeRef, TypePath typePath, String desc, boolean visible) {
-          return new EmptyAnnotationVisitor();
+          return new EmptyAnnotationVisitor(api);
         }
 
         @Override
         public AnnotationVisitor visitParameterAnnotation(
             int parameter, String desc, boolean visible) {
-          return new EmptyAnnotationVisitor();
+          return new EmptyAnnotationVisitor(api);
         }
 
         @Override
         public AnnotationVisitor visitInsnAnnotation(
             int typeRef, TypePath typePath, String desc, boolean visible) {
-          return new EmptyAnnotationVisitor();
+          return new EmptyAnnotationVisitor(api);
         }
 
         @Override
         public AnnotationVisitor visitTryCatchAnnotation(
             int typeRef, TypePath typePath, String desc, boolean visible) {
-          return new EmptyAnnotationVisitor();
+          return new EmptyAnnotationVisitor(api);
         }
 
         @Override
@@ -137,16 +149,16 @@ public class AnnotationsTest extends AbstractTest {
             int[] index,
             String desc,
             boolean visible) {
-          return new EmptyAnnotationVisitor();
+          return new EmptyAnnotationVisitor(api);
         }
       };
     }
   }
 
-  static class RemoveAnnotationsAdapter2 extends ClassVisitor {
+  static class DeleteAnnotationsAdapter extends ClassVisitor {
 
-    public RemoveAnnotationsAdapter2(final ClassVisitor cv) {
-      super(Opcodes.ASM5, cv);
+    public DeleteAnnotationsAdapter(final int api, final ClassVisitor cv) {
+      super(api, cv);
     }
 
     @Override
@@ -167,8 +179,7 @@ public class AnnotationsTest extends AbstractTest {
         final String desc,
         final String signature,
         final String[] exceptions) {
-      return new MethodVisitor(
-          Opcodes.ASM5, cv.visitMethod(access, name, desc, signature, exceptions)) {
+      return new MethodVisitor(api, cv.visitMethod(access, name, desc, signature, exceptions)) {
 
         @Override
         public AnnotationVisitor visitAnnotationDefault() {
diff --git a/test/conform/unit.xml b/test/conform/unit.xml
index a20726554d61e0f834f7a8803726d2cac7090d53..9b9f060d39d2d9577435ba0d9fe5172f535d4eac 100644
--- a/test/conform/unit.xml
+++ b/test/conform/unit.xml
@@ -37,6 +37,7 @@
            failureproperty="test.failed">
       <batchtest fork="yes" todir="${out.test}/reports">
         <fileset dir="${test}/conform">
+          <include name="org/objectweb/asm/AnnotationVisitorTest.java"/>
           <include name="org/objectweb/asm/AttributeTest.java"/>
           <include name="org/objectweb/asm/ClassReaderTest.java"/>
           <include name="org/objectweb/asm/ClassVisitorTest.java"/>