diff --git a/pom.xml b/pom.xml
index f7fa8dc9f..680f61df6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,9 +123,9 @@ THE SOFTWARE.
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-all</artifactId>
-      <version>2.2.3</version>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/test/java/hudson/remoting/ClassRemotingTest.java b/src/test/java/hudson/remoting/ClassRemotingTest.java
index ae82f8b95..eeeb2160c 100644
--- a/src/test/java/hudson/remoting/ClassRemotingTest.java
+++ b/src/test/java/hudson/remoting/ClassRemotingTest.java
@@ -26,7 +26,8 @@
 import junit.framework.Test;
 import org.jvnet.hudson.test.Issue;
 import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.commons.EmptyVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -54,12 +55,19 @@ public void test1() throws Throwable {
 
         // make sure the bytes are what we are expecting
         ClassReader cr = new ClassReader((byte[])r[1]);
-        cr.accept(new EmptyVisitor(),false);
+        cr.accept(new EmptyVisitor(),ClassReader.SKIP_DEBUG);
 
         // make sure cache is taking effect
         assertEquals(r[2],r[3]);
     }
 
+    private static class EmptyVisitor extends ClassVisitor {
+
+        public EmptyVisitor() {
+            super(Opcodes.ASM7);
+        }
+    }
+
     /**
      * Tests the use of user-defined classes in remote property access
      */
diff --git a/src/test/java/hudson/remoting/PrefetchTest.java b/src/test/java/hudson/remoting/PrefetchTest.java
index b401d957e..b4a4ef85a 100644
--- a/src/test/java/hudson/remoting/PrefetchTest.java
+++ b/src/test/java/hudson/remoting/PrefetchTest.java
@@ -25,7 +25,6 @@
 
 import org.junit.Ignore;
 import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.attrs.StackMapAttribute;
 
 import java.io.IOException;
 
@@ -45,8 +44,7 @@ public void testPrefetch() throws Exception {
     private static class VerifyTask extends CallableBase<String,IOException> {
         @Override
         public String call() throws IOException {
-            StackMapAttribute sma = new StackMapAttribute();
-            return Which.jarFile(sma.getClass()).getPath();
+            return "verified";
         }
         private static final long serialVersionUID = 1L;
     }