diff --git a/repl b/repl
index 20ffd4b66..c4a3f7afd 100755
--- a/repl
+++ b/repl
@@ -26,5 +26,5 @@ echo "Finished, starting REPL"
 java \
 	-Dscala.usejavacp=true \
 	-classpath "${GRADLE_CLASSPATH}" \
-	scala.tools.nsc.MainGenericRunner \
-	-i smack-repl/scala.repl
+	ammonite.repl.Main \
+	-f smack-repl/scala.repl
diff --git a/smack-repl/build.gradle b/smack-repl/build.gradle
index 4e9cb35fe..6bb8a5bf8 100644
--- a/smack-repl/build.gradle
+++ b/smack-repl/build.gradle
@@ -10,7 +10,9 @@ dependencies {
     compile project(':smack-extensions')
 	compile project(':smack-experimental')
 	compile project(':smack-legacy')
-    compile "org.scala-lang:scala-compiler:${scalaVersion}"
+    compile "com.lihaoyi:ammonite-repl_$scalaVersion:0.5.5"
+    testCompile project(path: ":smack-core", configuration: "testRuntime")
+    testCompile project(path: ":smack-core", configuration: "archives")
 }
 
 task printClasspath(dependsOn: assemble) << {
diff --git a/smack-repl/scala.repl b/smack-repl/scala.repl
index 0fcca635c..3cd2946f3 100644
--- a/smack-repl/scala.repl
+++ b/smack-repl/scala.repl
@@ -1,4 +1,4 @@
-org.igniterealtime.smack.repl.SmackRepl.init()
+org.igniterealtime.smack.smackrepl.SmackRepl.init()
 
 import org.jivesoftware.smack._
 import org.jivesoftware.smack.util.TLSUtils
diff --git a/smack-repl/src/main/java/org/igniterealtime/smack/repl/SmackRepl.java b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/SmackRepl.java
similarity index 96%
rename from smack-repl/src/main/java/org/igniterealtime/smack/repl/SmackRepl.java
rename to smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/SmackRepl.java
index 841e7fb1f..583c701b9 100644
--- a/smack-repl/src/main/java/org/igniterealtime/smack/repl/SmackRepl.java
+++ b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/SmackRepl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.igniterealtime.smack.repl;
+package org.igniterealtime.smack.smackrepl;
 
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.util.dns.javax.JavaxResolver;
diff --git a/smack-repl/src/main/java/org/igniterealtime/smack/repl/package-info.java b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/package-info.java
similarity index 93%
rename from smack-repl/src/main/java/org/igniterealtime/smack/repl/package-info.java
rename to smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/package-info.java
index 36c6a20a6..0ce9b9854 100644
--- a/smack-repl/src/main/java/org/igniterealtime/smack/repl/package-info.java
+++ b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/package-info.java
@@ -18,4 +18,4 @@
 /**
  * A REPL (Read Eval Print Loop) for Smack.
  */
-package org.igniterealtime.smack.repl;
+package org.igniterealtime.smack.smackrepl;
diff --git a/smack-repl/src/test/java/org/igniterealtime/smack/smackrepl/SmackReplTest.java b/smack-repl/src/test/java/org/igniterealtime/smack/smackrepl/SmackReplTest.java
new file mode 100644
index 000000000..f470d5422
--- /dev/null
+++ b/smack-repl/src/test/java/org/igniterealtime/smack/smackrepl/SmackReplTest.java
@@ -0,0 +1,29 @@
+/**
+ *
+ * Copyright 2016 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.igniterealtime.smack.smackrepl;
+
+import org.junit.Test;
+
+public class SmackReplTest {
+    /**
+     * Just here to ensure jacoco is not complaining.
+     */
+    @Test
+    public void emptyTest() {
+    }
+
+}