diff --git a/diesel_derives/Cargo.toml b/diesel_derives/Cargo.toml
index 601aefbf4ba8..7df9b103d8c8 100644
--- a/diesel_derives/Cargo.toml
+++ b/diesel_derives/Cargo.toml
@@ -16,7 +16,7 @@ quote = "1"
 proc-macro2 = "1"
 
 [dev-dependencies]
-cfg-if = "0.1.10"
+cfg-if = "1"
 dotenv = "0.15"
 
 [dev-dependencies.diesel]
diff --git a/diesel_migrations/migrations_macros/src/embed_migrations.rs b/diesel_migrations/migrations_macros/src/embed_migrations.rs
index 3cae44804c45..72a052ecae3f 100644
--- a/diesel_migrations/migrations_macros/src/embed_migrations.rs
+++ b/diesel_migrations/migrations_macros/src/embed_migrations.rs
@@ -48,7 +48,7 @@ fn migration_literal_from_path(path: &Path) -> Result<proc_macro2::TokenStream,
     }
     let up_sql = path.join("up.sql");
     let up_sql_path = up_sql.to_str();
-    let down_sql = path.join("up.sql");
+    let down_sql = path.join("down.sql");
     let down_sql_path = down_sql.to_str();
     let metadata = TomlMetadata::read_from_file(&path.join("metadata.toml")).unwrap_or_default();
     let run_in_transaction = metadata.run_in_transaction;
diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs
index 184d505af97e..304df149fe73 100644
--- a/diesel_migrations/migrations_macros/src/lib.rs
+++ b/diesel_migrations/migrations_macros/src/lib.rs
@@ -48,6 +48,30 @@ use proc_macro::TokenStream;
 /// # include!("../../../diesel/src/doctest_setup.rs");
 /// #
 /// # #[cfg(feature = "postgres")]
+/// # fn migration_connection() -> diesel::PgConnection {
+/// #    let connection_url = database_url_from_env("PG_DATABASE_URL");
+/// #    let conn = diesel::PgConnection::establish(&connection_url).unwrap();
+/// #    conn.begin_test_transaction().unwrap();
+/// #    conn
+/// # }
+/// #
+/// # #[cfg(feature = "sqlite")]
+/// # fn migration_connection() -> diesel::SqliteConnection {
+/// #    let connection_url = database_url_from_env("SQLITE_DATABASE_URL");
+/// #    let conn = diesel::SqliteConnection::establish(&connection_url).unwrap();
+/// #    conn.begin_test_transaction().unwrap();
+/// #    conn
+/// # }
+/// #
+/// # #[cfg(feature = "mysql")]
+/// # fn migration_connection() -> diesel::MysqlConnection {
+/// #    let connection_url = database_url_from_env("MYSQL_DATABASE_URL");
+/// #    let conn = diesel::MysqlConnection::establish(&connection_url).unwrap();
+/// #    conn
+/// # }
+/// #
+/// #
+/// # #[cfg(feature = "postgres")]
 /// pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("../../migrations/postgresql");
 /// # #[cfg(all(feature = "mysql", not(feature = "postgres")))]
 /// # pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("../../migrations/mysql");
@@ -55,7 +79,7 @@ use proc_macro::TokenStream;
 /// # pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("../../migrations/sqlite");
 ///
 /// # fn main() {
-/// #     let connection = connection_no_data();
+/// #     let connection = migration_connection();
 /// #     run_migrations(&connection).unwrap();
 /// # }
 ///
diff --git a/migrations/mysql/20170211150830_index_columns_used_in_benchmarks/down.sql b/migrations/mysql/20170211150830_index_columns_used_in_benchmarks/down.sql
index c19dc97fecc6..f64472a9af3d 100644
--- a/migrations/mysql/20170211150830_index_columns_used_in_benchmarks/down.sql
+++ b/migrations/mysql/20170211150830_index_columns_used_in_benchmarks/down.sql
@@ -1,2 +1,2 @@
-DROP INDEX users_hair_color;
-DROP INDEX posts_user_id;
+DROP INDEX users_hair_color ON users;
+DROP INDEX posts_user_id ON posts;