3 files changed, 23 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/javaagent/ASMTransformer.java b/src/partest/scala/tools/partest/javaagent/ASMTransformer.java
index 643c683002..09cd485d6b 100644
--- a/src/partest/scala/tools/partest/javaagent/ASMTransformer.java
+++ b/src/partest/scala/tools/partest/javaagent/ASMTransformer.java
@@ -21,7 +21,9 @@ public class ASMTransformer implements ClassFileTransformer {
         // we instrument all classes from empty package
         (!className.contains("/") ||
         // we instrument all classes from scala package
-        className.startsWith("scala/"));
+        className.startsWith("scala/") ||
+        // we instrument all classes from `instrumented` package
+        className.startsWith("instrumented/"));
   }
 	
 	public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
diff --git a/test/files/instrumented/InstrumentationTest.check b/test/files/instrumented/InstrumentationTest.check
index 3652df270a..f0f447560a 100644
--- a/test/files/instrumented/InstrumentationTest.check
+++ b/test/files/instrumented/InstrumentationTest.check
@@ -1,4 +1,8 @@
 true
 Method call statistics:
+    1  Foo1.<init>()V
+    1  Foo1.someMethod()I
+    1  instrumented/Foo2.<init>()V
+    1  instrumented/Foo2.someMethod()I
     1  scala/Predef$.println(Ljava/lang/Object;)V
     1  scala/runtime/BoxesRunTime.boxToBoolean(Z)Ljava/lang/Boolean;
diff --git a/test/files/instrumented/InstrumentationTest.scala b/test/files/instrumented/InstrumentationTest.scala
index ec5314c624..0e53f80857 100644
--- a/test/files/instrumented/InstrumentationTest.scala
+++ b/test/files/instrumented/InstrumentationTest.scala
@@ -1,11 +1,27 @@
 import scala.tools.partest.instrumented.Instrumentation._
 
+/** We check if classes put in empty package are properly instrumented */
+class Foo1 {
+  def someMethod = 0
+}
+
+/** We check if classes put in `instrumented` package are properly instrumented */
+package instrumented {
+  class Foo2 {
+    def someMethod = 0
+  }
+}
+
 /** Tests if instrumentation itself works correctly */
 object Test {
   def main(args: Array[String]) {
     // force predef initialization before profiling
     Predef
     startProfiling()
+    val foo1 = new Foo1
+    foo1.someMethod
+    val foo2 = new instrumented.Foo2
+    foo2.someMethod
     // should box the boolean
     println(true)
     stopProfiling()