diff --git a/src/cli.rs b/src/cli.rs
index a5f8ade5d4..45d6dc2c25 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -35,7 +35,7 @@ impl<T> MaybeOwned<'a, T> {
     }
 }
 
-pub async fn cli() -> Result<(), Box<Error>> {
+pub async fn cli() -> Result<(), Box<dyn Error>> {
     let mut context = Context::basic()?;
 
     {
diff --git a/src/context.rs b/src/context.rs
index cc8752eefb..5c5bb4a8f2 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -12,7 +12,7 @@ pub struct Context {
 }
 
 impl Context {
-    crate fn basic() -> Result<Context, Box<Error>> {
+    crate fn basic() -> Result<Context, Box<dyn Error>> {
         Ok(Context {
             commands: indexmap::IndexMap::new(),
             host: Arc::new(Mutex::new(crate::env::host::BasicHost)),
diff --git a/src/main.rs b/src/main.rs
index 4705b34bb2..17a84a70f6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,13 +17,12 @@ mod parser;
 mod prelude;
 mod shell;
 mod stream;
-mod tests;
 
 use clap::{App, Arg};
 use log::LevelFilter;
 use std::error::Error;
 
-fn main() -> Result<(), Box<Error>> {
+fn main() -> Result<(), Box<dyn Error>> {
     let matches = App::new("nu shell")
         .version("0.5")
         .arg(
diff --git a/src/tests.rs b/tests/tests.rs
similarity index 100%
rename from src/tests.rs
rename to tests/tests.rs