diff --git a/apollo-router-scaffold/src/lib.rs b/apollo-router-scaffold/src/lib.rs
index c8daf453db..4f61989018 100644
--- a/apollo-router-scaffold/src/lib.rs
+++ b/apollo-router-scaffold/src/lib.rs
@@ -152,6 +152,7 @@ mod test {
     fn test_build(dir: &TempDir) -> Result<()> {
         let output = Command::new("cargo")
             .args(["test"])
+            .env("RUSTFLAGS", "-Dwarnings")
             .current_dir(dir)
             .output()?;
         if !output.status.success() {
diff --git a/apollo-router-scaffold/templates/plugin/src/plugins/{{snake_name}}.rs b/apollo-router-scaffold/templates/plugin/src/plugins/{{snake_name}}.rs
index 859241244d..2d64191420 100644
--- a/apollo-router-scaffold/templates/plugin/src/plugins/{{snake_name}}.rs
+++ b/apollo-router-scaffold/templates/plugin/src/plugins/{{snake_name}}.rs
@@ -1,12 +1,12 @@
 use apollo_router::plugin::Plugin;
 use apollo_router::register_plugin;
 {{#if type_basic}}
+use apollo_router::graphql::Response;
 use apollo_router::services::ResponseBody;
 use apollo_router::services::{ExecutionRequest, ExecutionResponse};
 use apollo_router::services::{QueryPlannerRequest, QueryPlannerResponse};
 use apollo_router::services::{RouterRequest, RouterResponse};
 use apollo_router::services::{SubgraphRequest, SubgraphResponse};
-use apollo_router::Response;
 {{/if}}
 {{#if type_auth}}
 use apollo_router::services::ResponseBody;