diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/kernel/commands/ClasspathMagicCommandTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/kernel/commands/ClasspathMagicCommandTest.java
index 5c68d987de..f0f05842ff 100644
--- a/kernel/base/src/test/java/com/twosigma/beakerx/kernel/commands/ClasspathMagicCommandTest.java
+++ b/kernel/base/src/test/java/com/twosigma/beakerx/kernel/commands/ClasspathMagicCommandTest.java
@@ -31,13 +31,15 @@
 public class ClasspathMagicCommandTest {
 
   private static final String SRC_TEST_RESOURCES = "./src/test/resources/";
-  private static final String CLASSPATH_TO_JAR = "../../doc/contents/demoResources/BeakerXClasspathTest.jar";
+  private static final String CLASSPATH_TO_JAR = SRC_TEST_RESOURCES + "dirWithTwoJars/foo.jar";
   private MagicCommand sut;
   private KernelTest kernel;
+  private EvaluatorTest evaluator;
 
   @Before
   public void setUp() throws Exception {
-    this.kernel = new KernelTest("id2", new EvaluatorTest());
+    this.evaluator = new EvaluatorTest();
+    this.kernel = new KernelTest("id2", evaluator);
     this.sut = new MagicCommand(kernel);
   }
 
@@ -55,6 +57,19 @@ public void handleClasspathAddJarMagicCommand() throws Exception {
     assertThat(kernel.getClasspath().get(0)).isEqualTo(CLASSPATH_TO_JAR);
   }
 
+  @Test
+  public void handleClasspathAddJarWildcardMagicCommand() throws Exception {
+    //given
+    String codeAsString = "" +
+        "%classpath add jar " + SRC_TEST_RESOURCES + "dirWithTwoJars/*";
+    Code code = new Code(codeAsString);
+    //when
+    MagicCommandResult result = sut.process(code, new Message(), 1);
+    //then
+    assertThat(classpath(result)).contains("foo.jar", "bar.jar");
+    assertThat(evaluator.getResetEnvironmentCounter()).isEqualTo(1);
+  }
+
   @Test
   public void shouldCreateMsgWithWrongMagic() throws Exception {
     //given
diff --git a/kernel/base/src/test/resources/dirWithTwoJars/bar.jar b/kernel/base/src/test/resources/dirWithTwoJars/bar.jar
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/kernel/base/src/test/resources/dirWithTwoJars/foo.jar b/kernel/base/src/test/resources/dirWithTwoJars/foo.jar
new file mode 100644
index 0000000000..e69de29bb2