diff --git a/scripts/devel-test.sh b/scripts/devel-test.sh
index 40f518c..99bbb11 100755
--- a/scripts/devel-test.sh
+++ b/scripts/devel-test.sh
@@ -2,8 +2,13 @@
 
 # Bring in the variables from SOLUTION file
 #
-export $(grep -v '^#' SOLUTION | xargs -d '\n')
-export $(grep -v '^#' MANIFEST | xargs -d '\n')
+CMD=xargs
+if [ $(which system_profiler) ]; then
+  CMD=gxargs
+fi
+
+export $(grep -v '^#' SOLUTION | ${CMD} -d '\n')
+export $(grep -v '^#' MANIFEST | ${CMD} -d '\n')
 
 export http_proxy=http://proxy-chain.intel.com:911
 export https_proxy=http://proxy-chain.intel.com:912
@@ -18,5 +23,5 @@ docker run \
   --device=/dev/dri \
   -e QSV_DEVICE=${QSV_DEVICE:-/dev/dri/renderD128} \
   --volume $(pwd)/media:/media \
-  intel-media-ffmpeg:devel \
+  ${REPO_URL}/${CONTAINER}:devel \
   test
\ No newline at end of file