diff --git a/examples/catj.ts b/examples/catj.ts
index 82fec5ff9eba38..79a129780409fd 100644
--- a/examples/catj.ts
+++ b/examples/catj.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env deno --allow-read
+#!/usr/bin/env -S deno --allow-read
 // Ported from: https://github.com/soheilpro/catj
 // Copyright (c) 2014 Soheil Rashidi
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
diff --git a/examples/gist.ts b/examples/gist.ts
index 6b5611120e8641..7c52662b49650b 100755
--- a/examples/gist.ts
+++ b/examples/gist.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env deno --allow-net --allow-env
+#!/usr/bin/env -S deno --allow-net --allow-env
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 
 const { args, env, exit, readFile } = Deno;
diff --git a/format.ts b/format.ts
index f0465af509988d..ca564855388614 100755
--- a/format.ts
+++ b/format.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env deno run --allow-run --allow-write --allow-read
+#!/usr/bin/env -S deno run --allow-run --allow-write --allow-read
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 const { exit, args, execPath } = Deno;
 import { parse } from "./flags/mod.ts";
diff --git a/http/file_server.ts b/http/file_server.ts
index 7d1d132c9fbe29..903d99c21d9225 100755
--- a/http/file_server.ts
+++ b/http/file_server.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env deno --allow-net
+#!/usr/bin/env -S deno --allow-net
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 
 // This program serves files in the current directory over HTTP.
diff --git a/installer/mod.ts b/installer/mod.ts
index d7ab125b31cf5b..927485342e3802 100644
--- a/installer/mod.ts
+++ b/installer/mod.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env deno --allow-all
+#!/usr/bin/env -S deno --allow-all
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 const { env, stdin, args, exit, writeFile, chmod, run } = Deno;
 import { parse } from "../flags/mod.ts";
@@ -24,7 +24,7 @@ ARGS:
   SCRIPT_URL  Local or remote URL of script to install
   [FLAGS...]  List of flags for script, both Deno permission and script specific
               flag can be used.
-              
+
 OPTIONS:
   -d, --dir <PATH> Installation directory path (defaults to ~/.deno/bin)
 `);
diff --git a/prettier/main.ts b/prettier/main.ts
index 03fe4605cd0731..1afda89d1fbad6 100755
--- a/prettier/main.ts
+++ b/prettier/main.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env deno --allow-run --allow-write
+#!/usr/bin/env -S deno --allow-run --allow-write
 /**
  * Copyright © James Long and contributors
  *
diff --git a/test.ts b/test.ts
index b3497da27701dd..8e292191e4ef2f 100755
--- a/test.ts
+++ b/test.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env deno run -A
+#!/usr/bin/env -S deno run -A
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 import "./archive/tar_test.ts";
 import "./bytes/test.ts";
diff --git a/testing/test.ts b/testing/test.ts
index 8c064427255714..c726ffb1abe847 100644
--- a/testing/test.ts
+++ b/testing/test.ts
@@ -6,7 +6,7 @@ import {
   assertStrictEq,
   assertThrows,
   assertThrowsAsync
-} from "../testing/asserts.ts";
+} from "./asserts.ts";
 import "./format_test.ts";
 import "./diff_test.ts";
 import "./pretty_test.ts";
diff --git a/uuid/test.ts b/uuid/test.ts
index 72616d3efebe40..257e07caff29df 100755
--- a/uuid/test.ts
+++ b/uuid/test.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env deno run
+#!/usr/bin/env -S deno run
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 import { runIfMain } from "../testing/mod.ts";