diff --git a/com.ibm.wala.cast.test/harness-src/c/Makefile b/com.ibm.wala.cast.test/harness-src/c/Makefile
index 01f5b2fe1..96a638043 100644
--- a/com.ibm.wala.cast.test/harness-src/c/Makefile
+++ b/com.ibm.wala.cast.test/harness-src/c/Makefile
@@ -27,8 +27,8 @@ $(C_GENERATED)/smoke_main.o:	$(TEST_JNI_BRIDGE_HEADER) smoke_main.cpp
 $(CAST_TEST_BIN)$(LIBPREFIX)xlator_test.$(DLLEXT):	$(C_GENERATED)/smoke.o
 	$(CC) $(CC_LDFLAGS) -Wl,-rpath -Wl,$(DOMO_AST_BIN) $(CAST_OBJS) -o $@
 
-main:	/tmp/smoke_main
+main:	$(C_GENERATED)/smoke_main
 
-/tmp/smoke_main:	$(TEST_JNI_BRIDGE_HEADER) $(DOMO_AST_BIN)/$(LIBPREFIX)cast/launch.o $(C_GENERATED)/smoke_main.o
+$(C_GENERATED)/smoke_main:	$(TEST_JNI_BRIDGE_HEADER) $(DOMO_AST_BIN)/$(LIBPREFIX)cast/launch.o $(C_GENERATED)/smoke_main.o
 	$(CC) $(ALL_FLAGS) $(DOMO_AST_BIN)/$(LIBPREFIX)cast/launch.o $(C_GENERATED)/smoke_main.o $(CC_LD_PATHS) -o $@ 
 
diff --git a/com.ibm.wala.cast.test/harness-src/c/smoke_main.cpp b/com.ibm.wala.cast.test/harness-src/c/smoke_main.cpp
index 458990f04..c29930ee1 100644
--- a/com.ibm.wala.cast.test/harness-src/c/smoke_main.cpp
+++ b/com.ibm.wala.cast.test/harness-src/c/smoke_main.cpp
@@ -37,7 +37,7 @@ int main(int argc, char **argv) {
   
   JNIEnv *java_env = launch_jvm(buf);
   
-  printf("2: %s\n", buf);
+  printf("2: %s, %p\n", buf, java_env);
   
   jclass NativeTranslatorTest =
     java_env->FindClass("com/ibm/wala/cast/test/TestNativeTranslator");
diff --git a/com.ibm.wala.cast.test/pom.xml b/com.ibm.wala.cast.test/pom.xml
index f16a15742..43c028825 100644
--- a/com.ibm.wala.cast.test/pom.xml
+++ b/com.ibm.wala.cast.test/pom.xml
@@ -35,7 +35,7 @@
 	    <id>test-native</id>
 	    <phase>test</phase>
 	    <configuration>
-	      <executable>/tmp/smoke_main</executable>
+	      <executable>${basedir}/../com.ibm.wala.cast/target/classes/libcast/smoke_main</executable>
 	      <arguments>
 		<argument>${project.build.outputDirectory}:${basedir}/../com.ibm.wala.cast/target/classes:${basedir}/../com.ibm.wala.core/target/classes:${basedir}/../com.ibm.wala.util/target/classes</argument>
 	      </arguments>
diff --git a/com.ibm.wala.cast/source/c/Makefile.definitions b/com.ibm.wala.cast/source/c/Makefile.definitions
index 26ba8fabe..04b7ef24b 100644
--- a/com.ibm.wala.cast/source/c/Makefile.definitions
+++ b/com.ibm.wala.cast/source/c/Makefile.definitions
@@ -17,7 +17,7 @@ endif
 
 vpath %.cpp	jni
 
-JAVA_INCLUDES = -I$(JAVA_SDK)include -I$(JAVA_SDK)include/$(JNI_MD_DIR) -DWALA_CLASSPATH="\"$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)\"" 
+JAVA_INCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JNI_MD_DIR) -DWALA_CLASSPATH="\"$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)\"" 
 
 CAPA_INCLUDE_DIR = ../../../com.ibm.wala.cast/source/c/include/
 CAPA_INCLUDES = -I$(CAPA_INCLUDE_DIR) -I$(C_GENERATED)
@@ -57,7 +57,7 @@ else
 endif
 endif
 
-CC_LD_PATHS = -L$(JAVA_SDK)jre/lib/amd64/server -Wl,-rpath -Wl,$(JAVA_SDK)jre/lib/amd64/server -L$(JAVA_SDK)jre/lib/x86_64/server -Wl,-rpath -Wl,$(JAVA_SDK)jre/lib/x86_64/server -L$(JAVA_SDK)jre/lib/x64/server -Wl,-rpath -Wl,$(JAVA_SDK)jre/lib/x64/server -L$(JAVA_SDK)jre/lib/server -Wl,-rpath -Wl,$(JAVA_SDK)jre/lib/server -L$(JAVA_SDK)jre/lib -Wl,-rpath -Wl,$(JAVA_SDK)jre/lib -ljvm
+CC_LD_PATHS = -L$(JAVA_HOME)/jre/lib/amd64/server -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib/amd64/server -L$(JAVA_HOME)/jre/lib/x86_64/server -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib/x86_64/server -L$(JAVA_HOME)/jre/lib/x64/server -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib/x64/server -L$(JAVA_HOME)/jre/lib/server -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib/server -L$(JAVA_HOME)/jre/lib -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib -ljvm
 
 CC_LDFLAGS += $(CC_LD_PATHS)