Index: cups/dest.c
===================================================================
--- cups/dest.c	(revision 8863)
+++ cups/dest.c	(working copy)
@@ -33,7 +33,6 @@
  *                           server.
  *   appleCopyLocations()  - Copy the location history array.
  *   appleCopyNetwork()    - Get the network ID for the current location.
- *   appleGetDefault()     - Get the default printer for this location.
  *   appleGetPaperSize()   - Get the default paper size.
  *   appleGetPrinter()     - Get a printer from the history array.
  *   appleSetDefault()     - Set the default printer for this location.
@@ -549,7 +548,7 @@
 
   if (!cups_get_sdests(http, op, name, 0, &dest))
   {
-    if (op == CUPS_GET_DEFAULT)
+    if (op == CUPS_GET_DEFAULT || name)
       return (NULL);
 
    /*
@@ -1288,6 +1287,9 @@
   CFPropertyListRef	uselast;	/* Use last printer preference value */
 
 
+  if (getenv("CUPS_DISABLE_APPLE_DEFAULT"))
+    return (0);
+
   if ((uselast = CFPreferencesCopyAppValue(kUseLastPrinterAsCurrentPrinterKey,
                                            kPMPrintingPreferences)) != NULL)
   {
Index: test/run-stp-tests.sh
===================================================================
--- test/run-stp-tests.sh	(revision 8863)
+++ test/run-stp-tests.sh	(working copy)
@@ -437,6 +437,7 @@
 
 export SHLIB_PATH
 
+CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
 CUPS_SERVER=localhost:8631; export CUPS_SERVER
 CUPS_SERVERROOT=/tmp/cups-$user; export CUPS_SERVERROOT
 CUPS_STATEDIR=/tmp/cups-$user; export CUPS_STATEDIR