diff --git a/macosx-setup.sh b/macosx-setup.sh
index c296117cc4..685f0af317 100755
--- a/macosx-setup.sh
+++ b/macosx-setup.sh
@@ -2341,15 +2341,13 @@ if [ "$QT_VERSION" ]; then
     # We need Xcode, not just the command-line tools, installed to build
     # Qt.
     #
-    # XXX - is this sufficient to differentiate between "command-line
-    # tools installed" and "Xcode installed"?  The old
+    # At least with Xcode 8, /usr/bin/xcodebuild --help fails if only
+    # the command-line tools are installed and succeeds if Xcode is
+    # installed.
     #
-    #    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1
-    #
-    # test did *not* work with Xcode 8 - it thought you didn't have
-    # Xcode installed even if you have Xcode 8 installed.
-    #
-    if [ ! -x /usr/bin/xcodebuild ]; then
+    if /usr/bin/xcodebuild -help >/dev/null 2>&1; then
+        :
+    else
         echo "Please install Xcode first (should be available on DVD or from http://developer.apple.com/xcode/index.php)."
         echo "The command-line build tools are not sufficient to build Qt."
         exit 1