diff --git a/testing/lisp/test-ob-C.el b/testing/lisp/test-ob-C.el
index 12a5e549b..5f1dd1acb 100644
--- a/testing/lisp/test-ob-C.el
+++ b/testing/lisp/test-ob-C.el
@@ -183,4 +183,5 @@
 				 ("Friday" "friday"))
 			       (org-babel-execute-src-block))))))
 
+(provide 'test-ob-C)
 ;;; test-ob-C.el ends here
diff --git a/testing/lisp/test-ob-awk.el b/testing/lisp/test-ob-awk.el
index 7f3c0f349..21151b21f 100644
--- a/testing/lisp/test-ob-awk.el
+++ b/testing/lisp/test-ob-awk.el
@@ -46,3 +46,6 @@
   (org-test-at-id "9e998b2a-3581-43fe-b26d-07d3c507b86a"
     (org-babel-next-src-block 4)
     (should (equal '(("a" "b" "c")) (org-babel-execute-src-block)))))
+
+(provide 'test-ob-awk)
+;;; test-ob-awk.el ends here
diff --git a/testing/lisp/test-ob-sed.el b/testing/lisp/test-ob-sed.el
index d8e5cacb2..0c0515ecd 100644
--- a/testing/lisp/test-ob-sed.el
+++ b/testing/lisp/test-ob-sed.el
@@ -58,5 +58,5 @@
 			 (buffer-string)))))))
 
 
-
+(provide 'test-ob-sed)
 ;;; test-ob-sed ends here
diff --git a/testing/lisp/test-property-inheritance.el b/testing/lisp/test-property-inheritance.el
index c00ad6c58..d3c3b0c64 100644
--- a/testing/lisp/test-property-inheritance.el
+++ b/testing/lisp/test-property-inheritance.el
@@ -45,6 +45,5 @@
    (org-babel-next-src-block 3)
    (should (= 6 (org-babel-execute-src-block)))))
 
-(provide 'test-ob-R)
-
+(provide 'test-property-inheritance)
 ;;; test-property-inheritance.el ends here
diff --git a/testing/org-test.el b/testing/org-test.el
index 30adb977e..3565dd0cf 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -373,7 +373,11 @@ setting `pp-escape-newlines' to nil manually."
 		   (condition-case err
 		       (when (string-match "^[A-Za-z].*\\.el$"
 					   (file-name-nondirectory path))
-			 (load-file path))
+                         (let ((feature-name
+                                (intern
+                                 (file-name-base
+                                  (file-name-nondirectory path)))))
+			   (require feature-name path)))
 		     (missing-test-dependency
 		      (let ((name (intern
 				   (concat "org-missing-dependency/"