diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index aa483ee4dc0..841bc54882c 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -378,7 +378,7 @@ def android_x86_release():
 
 def android_x86_wpt():
     build_task = android_x86_release()
-    return (
+    task = (
         linux_task("WPT")
         .with_treeherder("Android x86")
         .with_provisioner_id("proj-servo")
@@ -387,7 +387,12 @@ def android_x86_wpt():
         .with_scopes("project:servo:docker-worker-kvm:capability:privileged")
         .with_dockerfile(dockerfile_path("run-android-emulator"))
         .with_repo()
-        .with_curl_artifact_script(build_task, "servoapp.apk", "target/android/i686-linux-android/release")
+    )
+    apk_dir = "target/android/i686-linux-android/release"
+    return (
+        task
+        .with_script("mkdir -p " + apk_dir)
+        .with_curl_artifact_script(build_task, "servoapp.apk", apk_dir)
         .with_script("""
             ./mach bootstrap-android --accept-all-licences --emulator-x86
             ./mach test-android-startup --release
diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py
index 145a970a6ee..6a50e6cef9d 100644
--- a/etc/taskcluster/decisionlib.py
+++ b/etc/taskcluster/decisionlib.py
@@ -629,7 +629,6 @@ class UnixTaskMixin(Task):
             "CURL_%s_PATH" % n: file_path,
         }) \
         .with_script("""
-            mkdir -p $(dirname "$CURL_{n}_PATH")
             curl --retry 5 --connect-timeout 10 -Lf "$CURL_{n}_URL" -o "$CURL_{n}_PATH"
         """.format(n=n))