diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index c29538388d9f7135fcc1118b8542031604a68af7..ab734db3d7da76678bcdf79fcd8f8bee9d417ecb 100755
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -23,7 +23,7 @@
 	<property name="test-results" location="test/output/results"/>
 	<property name="test-input" location="test/input"/>
 	<property name="test-types" location="test/org/sleuthkit/datamodel"/>
-	<condition property="dlls" value="jni/.libs">  
+	<condition property="dlls" value=".:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java">  
         <os family="unix"/>  
     </condition>  
     <condition property="dlls" value="${env.LIBEWF_HOME}/msvscpp/zlib;${env.LIBEWF_HOME}/msvscpp/Release;../../win32/Release">  
diff --git a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
index 7a67c0300d9d9f3e9671bcb882e2b51512ca46ac..136557d5892d357c0782d43ca399528e4d00def9 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
@@ -411,6 +411,19 @@ protected static String getFsCData(FsContent fi) throws TskCoreException {
 	 * @param args Ignored
 	 */
 	public static void main(String[] args) {
+		if(System.getProperty("os.name").contains("Mac")||System.getProperty("os.name").toLowerCase().contains("unix")){
+			java.io.File dep = new java.io.File("/usr/local/lib");
+			boolean deps = false;
+			for(String chk: dep.list())
+			{
+				deps = (deps||chk.toLowerCase().contains("tsk"));
+			}
+			if(!deps)
+			{
+				System.out.println("Run make install on tsk");
+				throw new RuntimeException("Run make install on tsk");
+			}
+		}
 		String tempDirPath = System.getProperty("java.io.tmpdir");
 		tempDirPath = tempDirPath.substring(0, tempDirPath.length() - 1);
 		java.io.File pth = new java.io.File(DataModelTestSuite.goldStandardPath());
@@ -429,7 +442,6 @@ public boolean accept(java.io.File f) {
 			for (ImgTraverser tstrn : tests) {
 				String standardPath = DataModelTestSuite.standardPath(paths, tstrn.getClass().getSimpleName());
 				System.out.println("Creating " + tstrn.getClass().getSimpleName() + " standard for: " + paths.get(0));
-				System.out.println(System.getProperty("java.library.path"));
 				DataModelTestSuite.createStandard(standardPath, tempDirPath, paths, tstrn);
 			}
 			String standardPathCPP = DataModelTestSuite.standardPath(paths, CPPtoJavaCompare.class.getSimpleName());