diff --git a/lib/ecto/changeset.ex b/lib/ecto/changeset.ex
index 8624996225..cd2febc012 100644
--- a/lib/ecto/changeset.ex
+++ b/lib/ecto/changeset.ex
@@ -729,7 +729,7 @@ defmodule Ecto.Changeset do
           opts
 
         empty_values != empty_values() ->
-          # TODO: Remove changeset.empty_values field
+          # TODO: Remove changeset.empty_values field in Ecto v3.14
           IO.warn(
             "Changing the empty_values field of Ecto.Changeset is deprecated, " <>
               "please pass the :empty_values option on cast instead"
diff --git a/lib/ecto/schema.ex b/lib/ecto/schema.ex
index d846c3e46c..b5d5308d5d 100644
--- a/lib/ecto/schema.ex
+++ b/lib/ecto/schema.ex
@@ -2244,9 +2244,7 @@ defmodule Ecto.Schema do
   def __after_compile__(%{module: module} = env, _) do
     # If we are compiling code, we can validate associations now,
     # as the Elixir compiler will solve dependencies.
-    #
-    # TODO: Use Code.can_await_module_compilation?/0 from Elixir v1.11+.
-    if Process.info(self(), :error_handler) == {:error_handler, Kernel.ErrorHandler} do
+    if Code.can_await_module_compilation?() do
       for name <- module.__schema__(:associations) do
         assoc = module.__schema__(:association, name)
 
diff --git a/lib/mix/ecto.ex b/lib/mix/ecto.ex
index 4226a1e6b4..7f5a37a3db 100644
--- a/lib/mix/ecto.ex
+++ b/lib/mix/ecto.ex
@@ -24,9 +24,7 @@ defmodule Mix.Ecto do
   defp parse_repo([], []) do
     apps =
       if apps_paths = Mix.Project.apps_paths() do
-        # TODO: Use the proper ordering from Mix.Project.deps_apps
-        # when we depend on Elixir v1.11+.
-        apps_paths |> Map.keys() |> Enum.sort()
+        Enum.filter(Mix.Project.deps_apps(), &is_map_key(apps_paths, &1))
       else
         [Mix.Project.config()[:app]]
       end
@@ -64,14 +62,7 @@ defmodule Mix.Ecto do
   def ensure_repo(repo, args) do
     # Do not pass the --force switch used by some tasks downstream
     args = List.delete(args, "--force")
-
-    # TODO: Use only app.config when we depend on Elixir v1.11+.
-    if Code.ensure_loaded?(Mix.Tasks.App.Config) do
-      Mix.Task.run("app.config", args)
-    else
-      Mix.Task.run("loadpaths", args)
-      "--no-compile" not in args && Mix.Task.run("compile", args)
-    end
+    Mix.Task.run("app.config", args)
 
     case Code.ensure_compiled(repo) do
       {:module, _} ->