4 files changed, 13 insertions, 2 deletions
diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
index f046252522..f425eed72b 100644
--- a/qpid/java/broker/bin/qpid-passwd
+++ b/qpid/java/broker/bin/qpid-passwd
@@ -18,6 +18,11 @@
 # under the License.
 #
 
+if [ -z "$QPID_HOME" ]; then
+    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+    export PATH=${PATH}:${QPID_HOME}/bin
+fi
+
 # Set classpath to include Qpid jar with all required jars in manifest
 QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
 
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index d0198f8dc9..30c54f18cd 100644
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -18,6 +18,11 @@
 # under the License.
 #
 
+if [ -z "$QPID_HOME" ]; then
+    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+    export PATH=${PATH}:${QPID_HOME}/bin
+fi
+
 # Set classpath to include Qpid jar with all required jars in manifest
 QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar
 
diff --git a/qpid/java/common/bin/qpid-run b/qpid/java/common/bin/qpid-run
index c9e37b21a1..e9557f75cd 100755
--- a/qpid/java/common/bin/qpid-run
+++ b/qpid/java/common/bin/qpid-run
@@ -42,7 +42,8 @@ if [ -z $AMQJ_LOGGING_LEVEL ]; then
 fi
 
 if [ -z "$QPID_HOME" ]; then
-  die "QPID_HOME must be set"
+    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+    export PATH=${PATH}:${QPID_HOME}/bin
 fi
 
 if [ -z "$QPID_WORK" ]; then
diff --git a/qpid/java/java.testprofile b/qpid/java/java.testprofile
index 53ec4d340d..cef0a10661 100644
--- a/qpid/java/java.testprofile
+++ b/qpid/java/java.testprofile
@@ -1,4 +1,4 @@
-broker=build/bin/qpid-server
+broker=${project.root}/build/bin/qpid-server
 broker.clean=${project.root}/clean-dir ${build.data}
 broker.ready=Qpid Broker Ready