diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index c17275605..9c72cf2ab 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -56,7 +56,7 @@
               (car pair)
               (org-babel-python-var-to-python (cdr pair))))
     (nth 1 (or processed-params (org-babel-process-params params))) "\n")
-   "\n" (org-babel-trim body) "\n"))
+   "\n" (org-babel-trim body (if org-src-preserve-indentation "[\f\n\r\v]")) "\n"))
 
 (defun org-babel-execute:python (body params)
   "Execute a block of Python code with Babel.
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 3a0426acd..2fd415ba8 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -366,7 +366,7 @@ form
 	 (org-fill-template org-babel-tangle-comment-format-beg link-data)))
       (when org-babel-tangle-pad-newline (insert "\n"))
       (insert (format "%s\n" (replace-regexp-in-string
-			      "^," "" (org-babel-trim body))))
+			      "^," "" (org-babel-trim body (if org-src-preserve-indentation "[\f\n\r\v]")))))
       (when link-p
 	(insert-comment
 	 (org-fill-template org-babel-tangle-comment-format-end link-data))))))