diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0835fd94cd2..cc35b3a9430 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 * deprecations
   * [GenServer] Rename `GenServer.Behavior` to `GenServer.Behaviour`
+  * [Code] `Code.require_file` and `Code.load_file` now expect the full name as argument
 
 * bug fix
   * [Macro] Fixed a bug where quoted expressions were not behaving the same as their non-quoted counterparts
diff --git a/lib/eex/test/eex/smart_engine_test.exs b/lib/eex/test/eex/smart_engine_test.exs
index b089b2b8f25..35cf109cc78 100644
--- a/lib/eex/test/eex/smart_engine_test.exs
+++ b/lib/eex/test/eex/smart_engine_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule EEx.SmartEngineTest do
   use ExUnit.Case, async: true
diff --git a/lib/eex/test/eex/tokenizer_test.exs b/lib/eex/test/eex/tokenizer_test.exs
index 93e2c4c124b..4aa8106ed27 100644
--- a/lib/eex/test/eex/tokenizer_test.exs
+++ b/lib/eex/test/eex/tokenizer_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule EEx.TokenizerTest do
   use ExUnit.Case, async: true
diff --git a/lib/eex/test/eex_test.exs b/lib/eex/test/eex_test.exs
index 0942f122322..cd6a5223cf0 100644
--- a/lib/eex/test/eex_test.exs
+++ b/lib/eex/test/eex_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 require EEx
 
diff --git a/lib/elixir/lib/code.ex b/lib/elixir/lib/code.ex
index f01582b08d9..92d85898167 100644
--- a/lib/elixir/lib/code.ex
+++ b/lib/elixir/lib/code.ex
@@ -162,9 +162,6 @@ defmodule Code do
   in many times. I.e. if `load_file` is called N times with
   a given file, the given file will be loaded N times. Check
   `require_file` if you don't want a file to be loaded concurrently.
-
-  When loading a file, you may skip passing .exs as extension as
-  Elixir automatically adds it for you.
   """
   def load_file(file, relative_to // nil) when is_binary(file) do
     file = find_file(file, relative_to)
@@ -186,9 +183,6 @@ defmodule Code do
   available. I.e. if `require_file` is called N times with a given
   file, the given file will be loaded only once. Check `load_file`
   if you want a file to be loaded concurrently.
-
-  When requiring a file, you may skip passing .exs as extension as
-  Elixir automatically adds it for you.
   """
   def require_file(file, relative_to // nil) when is_binary(file) do
     file = find_file(file, relative_to)
@@ -332,6 +326,7 @@ defmodule Code do
     else
       prefix = "#{file}.exs"
       if File.regular?(prefix) do
+        IO.write "[WARNING] Passing a file without .exs extension to Code.load_file or Code.require_file is deprecated, please pass the full name instead\n#{Exception.formatted_stacktrace}"
         prefix
       else
         raise ArgumentError, message: "could not load #{file}"
diff --git a/lib/elixir/test/elixir/access_test.exs b/lib/elixir/test/elixir/access_test.exs
index cb9d63e4290..f2a8614cbb2 100644
--- a/lib/elixir/test/elixir/access_test.exs
+++ b/lib/elixir/test/elixir/access_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule Access.TupleTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/behaviour_test.exs b/lib/elixir/test/elixir/behaviour_test.exs
index 3e77c03fd52..39ab2a8ab73 100644
--- a/lib/elixir/test/elixir/behaviour_test.exs
+++ b/lib/elixir/test/elixir/behaviour_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule BehaviourTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/binary/chars_test.exs b/lib/elixir/test/elixir/binary/chars_test.exs
index 9bd99a31ed2..fbfeb15b6c2 100644
--- a/lib/elixir/test/elixir/binary/chars_test.exs
+++ b/lib/elixir/test/elixir/binary/chars_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Binary.Chars.AtomTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/binary/inspect_test.exs b/lib/elixir/test/elixir/binary/inspect_test.exs
index 08a551a5731..b0a63de39f2 100644
--- a/lib/elixir/test/elixir/binary/inspect_test.exs
+++ b/lib/elixir/test/elixir/binary/inspect_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Binary.Inspect.AtomTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/binary_test.exs b/lib/elixir/test/elixir/binary_test.exs
index 51b9a66676b..dcb3644a36d 100644
--- a/lib/elixir/test/elixir/binary_test.exs
+++ b/lib/elixir/test/elixir/binary_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule Binary.LiteralTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/bitwise_test.exs b/lib/elixir/test/elixir/bitwise_test.exs
index 3959e5a556f..59d16440ace 100644
--- a/lib/elixir/test/elixir/bitwise_test.exs
+++ b/lib/elixir/test/elixir/bitwise_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule Bitwise.FunctionsTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/char_list_test.exs b/lib/elixir/test/elixir/char_list_test.exs
index 3caf2ec4b4e..ae000d8dd67 100644
--- a/lib/elixir/test/elixir/char_list_test.exs
+++ b/lib/elixir/test/elixir/char_list_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule CharListTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/code_test.exs b/lib/elixir/test/elixir/code_test.exs
index cb24541ec06..8a1b605576e 100644
--- a/lib/elixir/test/elixir/code_test.exs
+++ b/lib/elixir/test/elixir/code_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule CodeTest do
   use ExUnit.Case, async: true
@@ -29,13 +29,13 @@ defmodule CodeTest do
   end
 
   test :require do
-    Code.require_file fixture_path("code_sample")
+    Code.require_file fixture_path("code_sample.exs")
     assert fixture_path("code_sample.exs") in Code.loaded_files
-    assert Code.require_file(fixture_path("code_sample")) == nil
+    assert Code.require_file(fixture_path("code_sample.exs")) == nil
 
     Code.unload_files [fixture_path("code_sample.exs")]
     refute fixture_path("code_sample.exs") in Code.loaded_files
-    assert Code.require_file(fixture_path("code_sample")) != nil
+    assert Code.require_file(fixture_path("code_sample.exs")) != nil
   end
 
   test :file do
diff --git a/lib/elixir/test/elixir/dict_test.exs b/lib/elixir/test/elixir/dict_test.exs
index 8288ebef50f..ecf7577cdb8 100644
--- a/lib/elixir/test/elixir/dict_test.exs
+++ b/lib/elixir/test/elixir/dict_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule DictTest.Common do
   defmacro __using__(module) do
diff --git a/lib/elixir/test/elixir/enum_test.exs b/lib/elixir/test/elixir/enum_test.exs
index b945e2706e3..f37c8d6cded 100644
--- a/lib/elixir/test/elixir/enum_test.exs
+++ b/lib/elixir/test/elixir/enum_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule EnumTest.Common do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/exception_test.exs b/lib/elixir/test/elixir/exception_test.exs
index 58a5dc4efab..523a642dbfd 100644
--- a/lib/elixir/test/elixir/exception_test.exs
+++ b/lib/elixir/test/elixir/exception_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule Kernel.ExceptionTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/file_test.exs b/lib/elixir/test/elixir/file_test.exs
index 6e68dd2b1f9..f42184fa5e8 100644
--- a/lib/elixir/test/elixir/file_test.exs
+++ b/lib/elixir/test/elixir/file_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule FileTest do
   import PathHelpers
diff --git a/lib/elixir/test/elixir/iex/autocomplete_test.exs b/lib/elixir/test/elixir/iex/autocomplete_test.exs
index 91097f62c22..aaa642af220 100644
--- a/lib/elixir/test/elixir/iex/autocomplete_test.exs
+++ b/lib/elixir/test/elixir/iex/autocomplete_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule IEx.AutocompleteTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/io_test.exs b/lib/elixir/test/elixir/io_test.exs
index 07101663b58..066ba0b7d76 100644
--- a/lib/elixir/test/elixir/io_test.exs
+++ b/lib/elixir/test/elixir/io_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule IOTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/kernel/alias_test.exs b/lib/elixir/test/elixir/kernel/alias_test.exs
index e0f771acd4b..537ce36c57e 100644
--- a/lib/elixir/test/elixir/kernel/alias_test.exs
+++ b/lib/elixir/test/elixir/kernel/alias_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.AliasTest.Nested do
   def value, do: 1
diff --git a/lib/elixir/test/elixir/kernel/case_test.exs b/lib/elixir/test/elixir/kernel/case_test.exs
index b82e7df7aa4..2f72096eb67 100644
--- a/lib/elixir/test/elixir/kernel/case_test.exs
+++ b/lib/elixir/test/elixir/kernel/case_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.CaseTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/kernel/cli_test.exs b/lib/elixir/test/elixir/kernel/cli_test.exs
index 63b29593cac..28fa534d9f6 100644
--- a/lib/elixir/test/elixir/kernel/cli_test.exs
+++ b/lib/elixir/test/elixir/kernel/cli_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.CLI.InitTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/kernel/comprehension_test.exs b/lib/elixir/test/elixir/kernel/comprehension_test.exs
index c718b5de054..8f552793efb 100644
--- a/lib/elixir/test/elixir/kernel/comprehension_test.exs
+++ b/lib/elixir/test/elixir/kernel/comprehension_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.ComprehensionTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/kernel/def_clauses_test.exs b/lib/elixir/test/elixir/kernel/def_clauses_test.exs
index 562e300469d..b28e4b2a891 100644
--- a/lib/elixir/test/elixir/kernel/def_clauses_test.exs
+++ b/lib/elixir/test/elixir/kernel/def_clauses_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.DefClause do
   defmacro defclause(expr, block) do
diff --git a/lib/elixir/test/elixir/kernel/doc_test.exs b/lib/elixir/test/elixir/kernel/doc_test.exs
index 01e7c14054a..40c87766a60 100644
--- a/lib/elixir/test/elixir/kernel/doc_test.exs
+++ b/lib/elixir/test/elixir/kernel/doc_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.DocTest do
   use ExUnit.Case
diff --git a/lib/elixir/test/elixir/kernel/errors_test.exs b/lib/elixir/test/elixir/kernel/errors_test.exs
index a3d140d47ef..85d0ba557fe 100644
--- a/lib/elixir/test/elixir/kernel/errors_test.exs
+++ b/lib/elixir/test/elixir/kernel/errors_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.ErrorsTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/kernel/import_test.exs b/lib/elixir/test/elixir/kernel/import_test.exs
index fd4d2634b3c..e5e0cc5a073 100644
--- a/lib/elixir/test/elixir/kernel/import_test.exs
+++ b/lib/elixir/test/elixir/kernel/import_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.ImportAvailable do
   defmacro flatten do
diff --git a/lib/elixir/test/elixir/kernel/macros_test.exs b/lib/elixir/test/elixir/kernel/macros_test.exs
index 937669969c1..522fcca026b 100644
--- a/lib/elixir/test/elixir/kernel/macros_test.exs
+++ b/lib/elixir/test/elixir/kernel/macros_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.MacrosTest.Nested do
   defmacro value, do: 1
diff --git a/lib/elixir/test/elixir/kernel/overridable_test.exs b/lib/elixir/test/elixir/kernel/overridable_test.exs
index 3c5c7e39bf8..51a1808af9a 100644
--- a/lib/elixir/test/elixir/kernel/overridable_test.exs
+++ b/lib/elixir/test/elixir/kernel/overridable_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.Overridable do
   def sample do
diff --git a/lib/elixir/test/elixir/kernel/partial_application_test.exs b/lib/elixir/test/elixir/kernel/partial_application_test.exs
index 6e691ca4dd2..960625519f1 100644
--- a/lib/elixir/test/elixir/kernel/partial_application_test.exs
+++ b/lib/elixir/test/elixir/kernel/partial_application_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.PartialApplicationTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/kernel/quote_test.exs b/lib/elixir/test/elixir/kernel/quote_test.exs
index a6c0f0a0884..288685710b7 100644
--- a/lib/elixir/test/elixir/kernel/quote_test.exs
+++ b/lib/elixir/test/elixir/kernel/quote_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.QuoteTest.Hygiene do
   defmacro no_interference do
diff --git a/lib/elixir/test/elixir/kernel/rescue_test.exs b/lib/elixir/test/elixir/kernel/rescue_test.exs
index ef0c45b7913..bfd802004c4 100644
--- a/lib/elixir/test/elixir/kernel/rescue_test.exs
+++ b/lib/elixir/test/elixir/kernel/rescue_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Kernel.RescueTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/kernel_test.exs b/lib/elixir/test/elixir/kernel_test.exs
index 12e19b0f9dd..130962ee77e 100644
--- a/lib/elixir/test/elixir/kernel_test.exs
+++ b/lib/elixir/test/elixir/kernel_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule KernelTest do
   defmodule Conversions do
diff --git a/lib/elixir/test/elixir/keyword_test.exs b/lib/elixir/test/elixir/keyword_test.exs
index 9103168b778..5a9a6ac7b90 100644
--- a/lib/elixir/test/elixir/keyword_test.exs
+++ b/lib/elixir/test/elixir/keyword_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule KeywordTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/list/chars_test.exs b/lib/elixir/test/elixir/list/chars_test.exs
index a545bc6bafb..264be6f20c8 100644
--- a/lib/elixir/test/elixir/list/chars_test.exs
+++ b/lib/elixir/test/elixir/list/chars_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule List.Chars.AtomTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/list_test.exs b/lib/elixir/test/elixir/list_test.exs
index c8244425966..299caa59e97 100644
--- a/lib/elixir/test/elixir/list_test.exs
+++ b/lib/elixir/test/elixir/list_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule ListTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/macro_test.exs b/lib/elixir/test/elixir/macro_test.exs
index 0fb02b0b67c..35f4dab315d 100644
--- a/lib/elixir/test/elixir/macro_test.exs
+++ b/lib/elixir/test/elixir/macro_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule Macro.ExternalTest do
   defmacro external do
diff --git a/lib/elixir/test/elixir/module_test.exs b/lib/elixir/test/elixir/module_test.exs
index 9d10f092d0e..4c8413189f2 100644
--- a/lib/elixir/test/elixir/module_test.exs
+++ b/lib/elixir/test/elixir/module_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule ModuleTest.ToBeUsed do
   def value, do: 1
diff --git a/lib/elixir/test/elixir/option_parser_test.exs b/lib/elixir/test/elixir/option_parser_test.exs
index c3c2abd6f30..91c6bea04ea 100644
--- a/lib/elixir/test/elixir/option_parser_test.exs
+++ b/lib/elixir/test/elixir/option_parser_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule OptionParserTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/protocol_test.exs b/lib/elixir/test/elixir/protocol_test.exs
index 8960c0b5a3a..b09ed6695b9 100644
--- a/lib/elixir/test/elixir/protocol_test.exs
+++ b/lib/elixir/test/elixir/protocol_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defprotocol ProtocolTest.WithAll do
   @doc "Blank"
diff --git a/lib/elixir/test/elixir/range_test.exs b/lib/elixir/test/elixir/range_test.exs
index 3aadfe5d811..a3d10be348d 100644
--- a/lib/elixir/test/elixir/range_test.exs
+++ b/lib/elixir/test/elixir/range_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule RangeTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/record_test.exs b/lib/elixir/test/elixir/record_test.exs
index fc57767d3e1..64a5214df57 100644
--- a/lib/elixir/test/elixir/record_test.exs
+++ b/lib/elixir/test/elixir/record_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defrecord RecordTest.FileInfo,
   Record.extract(:file_info, from_lib: "kernel/include/file.hrl")
diff --git a/lib/elixir/test/elixir/regex_test.exs b/lib/elixir/test/elixir/regex_test.exs
index bd80f3db832..96466705fc4 100644
--- a/lib/elixir/test/elixir/regex_test.exs
+++ b/lib/elixir/test/elixir/regex_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule Regex.BinaryTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/system_test.exs b/lib/elixir/test/elixir/system_test.exs
index 1412a320a74..0bfb2961262 100644
--- a/lib/elixir/test/elixir/system_test.exs
+++ b/lib/elixir/test/elixir/system_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 require Erlang.os, as: OS
 
diff --git a/lib/elixir/test/elixir/tuple_test.exs b/lib/elixir/test/elixir/tuple_test.exs
index cc93718e381..475d70e617d 100644
--- a/lib/elixir/test/elixir/tuple_test.exs
+++ b/lib/elixir/test/elixir/tuple_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule TupleTest do
   use ExUnit.Case, async: true
diff --git a/lib/elixir/test/elixir/typespec_test.exs b/lib/elixir/test/elixir/typespec_test.exs
index 36b703d5a68..32ee87f7824 100644
--- a/lib/elixir/test/elixir/typespec_test.exs
+++ b/lib/elixir/test/elixir/typespec_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule Typespec.Test.Type do
   use ExUnit.Case, async: true
diff --git a/lib/ex_unit/test/ex_unit/assertions_test.exs b/lib/ex_unit/test/ex_unit/assertions_test.exs
index 8dd736ff548..2342583b62f 100644
--- a/lib/ex_unit/test/ex_unit/assertions_test.exs
+++ b/lib/ex_unit/test/ex_unit/assertions_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule ExUnit.AssertionsTest.Value do
   def tuple, do: { 2, 1 }
diff --git a/lib/ex_unit/test/ex_unit/callbacks_test.exs b/lib/ex_unit/test/ex_unit/callbacks_test.exs
index dd661c408a7..f9d88fe5a90 100644
--- a/lib/ex_unit/test/ex_unit/callbacks_test.exs
+++ b/lib/ex_unit/test/ex_unit/callbacks_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule ExUnit.CallbacksTest do
   use ExUnit.Case, sync: false
diff --git a/lib/mix/lib/mix/tasks/new.ex b/lib/mix/lib/mix/tasks/new.ex
index ebc13d62825..68cda21232e 100644
--- a/lib/mix/lib/mix/tasks/new.ex
+++ b/lib/mix/lib/mix/tasks/new.ex
@@ -105,7 +105,7 @@ defmodule Mix.Tasks.New do
   """
 
   embed_template :test_lib, """
-  Code.require_file "../test_helper", __FILE__
+  Code.require_file "../test_helper.exs", __FILE__
 
   defmodule <%= @mod %>Test do
     use ExUnit.Case
diff --git a/lib/mix/test/mix/cli_test.exs b/lib/mix/test/mix/cli_test.exs
index 4b04b7289d9..2c15f0ed8ba 100644
--- a/lib/mix/test/mix/cli_test.exs
+++ b/lib/mix/test/mix/cli_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Mix.CLITest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/generator_test.exs b/lib/mix/test/mix/generator_test.exs
index 8de78265cb8..c622796c6e7 100644
--- a/lib/mix/test/mix/generator_test.exs
+++ b/lib/mix/test/mix/generator_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Mix.GeneratorTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/project_test.exs b/lib/mix/test/mix/project_test.exs
index b2f08f3ba96..3619eb3a3bf 100644
--- a/lib/mix/test/mix/project_test.exs
+++ b/lib/mix/test/mix/project_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Mix.ProjectTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/task_test.exs b/lib/mix/test/mix/task_test.exs
index 4e08fc0a29b..f04d217ec34 100644
--- a/lib/mix/test/mix/task_test.exs
+++ b/lib/mix/test/mix/task_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Mix.TaskTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/clean_test.exs b/lib/mix/test/mix/tasks/clean_test.exs
index b8c688f6d9b..07a24e4af90 100644
--- a/lib/mix/test/mix/tasks/clean_test.exs
+++ b/lib/mix/test/mix/tasks/clean_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.CleanTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/compile.app_test.exs b/lib/mix/test/mix/tasks/compile.app_test.exs
index 81867d78f96..36601eedfea 100644
--- a/lib/mix/test/mix/tasks/compile.app_test.exs
+++ b/lib/mix/test/mix/tasks/compile.app_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.Compile.AppTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/compile.elixir_test.exs b/lib/mix/test/mix/tasks/compile.elixir_test.exs
index 6f7d98147bc..23f32937b4b 100644
--- a/lib/mix/test/mix/tasks/compile.elixir_test.exs
+++ b/lib/mix/test/mix/tasks/compile.elixir_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.Compile.ElixirTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/compile_test.exs b/lib/mix/test/mix/tasks/compile_test.exs
index 9e5095a2f45..c2542beeb74 100644
--- a/lib/mix/test/mix/tasks/compile_test.exs
+++ b/lib/mix/test/mix/tasks/compile_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.CompileTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/deps.git_test.exs b/lib/mix/test/mix/tasks/deps.git_test.exs
index 23f9271227f..47d490fc3ca 100644
--- a/lib/mix/test/mix/tasks/deps.git_test.exs
+++ b/lib/mix/test/mix/tasks/deps.git_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.DepsGitTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/deps.raw_test.exs b/lib/mix/test/mix/tasks/deps.raw_test.exs
index 0b22d51baab..4abf0f07126 100644
--- a/lib/mix/test/mix/tasks/deps.raw_test.exs
+++ b/lib/mix/test/mix/tasks/deps.raw_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.DepsPathTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/deps_test.exs b/lib/mix/test/mix/tasks/deps_test.exs
index 6b684fbaa3f..705f03fbdd4 100644
--- a/lib/mix/test/mix/tasks/deps_test.exs
+++ b/lib/mix/test/mix/tasks/deps_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.DepsTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/local_test.exs b/lib/mix/test/mix/tasks/local_test.exs
index 14c9f1e1ce9..bd662ebcb27 100644
--- a/lib/mix/test/mix/tasks/local_test.exs
+++ b/lib/mix/test/mix/tasks/local_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.LocalTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/new_test.exs b/lib/mix/test/mix/tasks/new_test.exs
index 39705b3ec1c..c273f14d2dd 100644
--- a/lib/mix/test/mix/tasks/new_test.exs
+++ b/lib/mix/test/mix/tasks/new_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.NewTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/tasks/run_test.exs b/lib/mix/test/mix/tasks/run_test.exs
index 92dd698e83d..d6efc0d6b51 100644
--- a/lib/mix/test/mix/tasks/run_test.exs
+++ b/lib/mix/test/mix/tasks/run_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../../test_helper", __FILE__
+Code.require_file "../../../test_helper.exs", __FILE__
 
 defmodule Mix.Tasks.RunTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix/utils_test.exs b/lib/mix/test/mix/utils_test.exs
index f3cef1ca2ed..bf6b67a7d91 100644
--- a/lib/mix/test/mix/utils_test.exs
+++ b/lib/mix/test/mix/utils_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../../test_helper", __FILE__
+Code.require_file "../../test_helper.exs", __FILE__
 
 defmodule Mix.UtilsTest do
   use MixTest.Case
diff --git a/lib/mix/test/mix_test.exs b/lib/mix/test/mix_test.exs
index 67a957d94bc..f408691deaf 100644
--- a/lib/mix/test/mix_test.exs
+++ b/lib/mix/test/mix_test.exs
@@ -1,4 +1,4 @@
-Code.require_file "../test_helper", __FILE__
+Code.require_file "../test_helper.exs", __FILE__
 
 defmodule MixTest do
   use MixTest.Case