diff --git a/build.xml b/build.xml
index b43abec..1386f8f 100644
--- a/build.xml
+++ b/build.xml
@@ -149,7 +149,12 @@
 	  <echo message="running tests" />
 	  <mkdir dir="${build}/output" />
 	  <junit fork="on" failureproperty="testfailed">
-	    <classpath refid="solandra.classpath" />
+
+	    <classpath>	      
+	      <path refid="solandra.classpath"/>
+	      <pathelement location="${basedir}/solandra-app/"/>
+	    </classpath>
+
 	    <formatter type="xml" usefile="true" />
 	    <formatter type="brief" usefile="false" />
 	    
@@ -158,6 +163,9 @@
 	    </batchtest>
 	    
 	    <jvmarg value="-Xmx1G" />
+	    <jvmarg value="-Dlog4j.configuration=file:///${basedir}/resources/log4j.properties"/>
+	    <jvmarg value="-Dlog4j.defaultInitOverride=true" />
+	    
 	  </junit>
 	  <fail if="testfailed" message="Some test(s) failed." />
 	</target>
diff --git a/src/lucandra/CassandraUtils.java b/src/lucandra/CassandraUtils.java
index 7d58f7d..ad6b477 100644
--- a/src/lucandra/CassandraUtils.java
+++ b/src/lucandra/CassandraUtils.java
@@ -123,7 +123,7 @@ public class CassandraUtils
     // 10 seconds.
     static
     {
-        String config = System.getProperty("log4j.configuration", "log4j-server.properties");
+        String config = System.getProperty("log4j.configuration", "log4j.properties");
         URL configLocation = null;
         try
         {