@@ -1543,7 +1543,7 @@ if is_service_enabled key && is_service_enabled swift3 && is_service_enabled nov

     add_nova_opt "s3_affix_tenant=True"

 fi

-screen_it zeromq "cd $NOVA_DIR && $NOVA_DIR/bin/nova-rpc-zmq-receiver"

+screen_it zeromq "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-rpc-zmq-receiver"

 # Launch the nova-api and wait for it to answer before continuing

 if is_service_enabled n-api; then

@@ -185,7 +185,7 @@ SSH_TIMEOUT=4

 # Whitebox testing configuration for Compute...

 COMPUTE_WHITEBOX_ENABLED=True

 COMPUTE_SOURCE_DIR=$NOVA_SOURCE_DIR

-COMPUTE_BIN_DIR=/usr/bin/nova

+COMPUTE_BIN_DIR=$NOVA_BIN_DIR

 COMPUTE_CONFIG_PATH=/etc/nova/nova.conf

 # TODO(jaypipes): Create the key file here... right now, no whitebox

 # tests actually use a key.