=== modified file 'common/CommonUtils.vala'
--- old/common/CommonUtils.vala	2013-03-14 20:40:57 +0000
+++ new/common/CommonUtils.vala	2013-03-25 19:32:56 +0000
@@ -665,7 +665,7 @@
     return {tempdir};
   // Prefer directories that have their own cleanup logic in case ours isn't
   // run for a while.  (e.g. /tmp every boot, /var/tmp every now and then)
-  return {Environment.get_tmp_dir(), "/var/tmp",
+  return {"/var/tmp", Environment.get_tmp_dir(),
           Path.build_filename(Environment.get_user_cache_dir(), Config.PACKAGE,
                               "tmp")};
 }

=== modified file 'tests/runner.vala'
--- old/tests/runner.vala	2013-02-04 20:39:45 +0000
+++ new/tests/runner.vala	2013-03-25 18:54:44 +0000
@@ -670,7 +670,19 @@
   }
 
   try {
-    var dir = DirUtils.make_tmp("deja-dup-test-XXXXXX");
+    var dir = null;
+    var tempdirs = DejaDup.get_tempdirs();
+    foreach (var tempdir in tempdirs) {
+      try {
+        var testpath = tempdir + "/deja-dup-test-XXXXXX";
+        dir = DirUtils.mkdtemp(testpath);
+        if (dir != null)
+          break;
+      }
+      catch (Error e) {
+        warning("%s\n", e.message);
+      }
+    }
     Environment.set_variable("DEJA_DUP_TEST_HOME", dir, true);
   } catch (Error e) {
     printerr("Could not make temporary dir\n");

=== modified file 'tools/duplicity/DuplicityJob.vala'
--- old/tools/duplicity/DuplicityJob.vala	2013-01-20 19:54:44 +0000
+++ new/tools/duplicity/DuplicityJob.vala	2013-03-25 19:34:40 +0000
@@ -132,11 +132,17 @@
 
     /* Fake cache dir if we need to */
     if ((flags & DejaDup.ToolJob.Flags.NO_CACHE) != 0) {
-      try {
-        forced_cache_dir = DirUtils.make_tmp("deja-dup-XXXXXX");
-      }
-      catch (Error e) {
-        warning("%s\n", e.message);
+      var tempdirs = DejaDup.get_tempdirs();
+      foreach (var tempdir in tempdirs) {
+        try {
+          var testpath = tempdir + "/deja-dup-XXXXXX";
+          forced_cache_dir = DirUtils.mkdtemp(testpath);
+          if (forced_cache_dir != null)
+            break;
+        }
+        catch (Error e) {
+          warning("%s\n", e.message);
+        }
       }
     }