diff --git a/bin/cdist-object-code-run b/bin/cdist-object-code-run
index d0722788..97cb58ac 100755
--- a/bin/cdist-object-code-run
+++ b/bin/cdist-object-code-run
@@ -36,6 +36,5 @@ cdist-code-run "$__cdist_object" "${__cdist_name_gencode_local}" \
 
 # Code remote
 cdist-run-remote "$__cdist_target_host" \
-   "export __cdist_out_object_dir=\"$__cdist_remote_out_object_dir\";" \
    "cdist-code-run" "$__cdist_object" "${__cdist_name_gencode_remote}" \
    || __cdist_exit_err "Remote code failed for $__cdist_object"
diff --git a/bin/cdist-run-remote b/bin/cdist-run-remote
index 93cf9062..4a4452a2 100755
--- a/bin/cdist-run-remote
+++ b/bin/cdist-run-remote
@@ -28,4 +28,6 @@ set -ue
 __cdist_target_host="$1"; shift
 
 ssh "${__cdist_remote_user}@${__cdist_target_host}"   \
-   "export PATH=\"${__cdist_remote_bin_dir}:\$PATH\";" "$@"
+   "export PATH=\"${__cdist_remote_bin_dir}:\$PATH\";" \
+   "export __cdist_out_object_dir=\"$__cdist_remote_out_object_dir\";" \
+   "$@"