diff --git a/cli.js b/cli.js
index ee57608bd..d4b313c21 100755
--- a/cli.js
+++ b/cli.js
@@ -165,13 +165,6 @@ api.on('test-run', function (runStatus) {
 });
 
 var files = cli.input.length ? cli.input : arrify(conf.files);
-if (files.length === 0) {
-	files = [
-		'test.js',
-		'test-*.js',
-		'test'
-	];
-}
 
 if (cli.flags.watch) {
 	try {
diff --git a/test/ava-files.js b/test/ava-files.js
index d4bdbfa3c..0cedc4d1b 100644
--- a/test/ava-files.js
+++ b/test/ava-files.js
@@ -104,3 +104,29 @@ test('findFiles - does not return duplicates of the same file', function (t) {
 		t.end();
 	});
 });
+
+test('findFiles - finds the correct files by default', function (t) {
+	var avaFiles = new AvaFiles(['**/ava-files/default-patterns/**']);
+	var filesToFind = [
+		'sub/directory/__tests__/foo.js',
+		'sub/directory/bar.test.js',
+		'test-foo.js',
+		'test.js',
+		'test/baz.js'
+	];
+
+	avaFiles.findTestFiles().then(function (files) {
+		var allFilesFound = filesToFind.every(function (fileToFind) {
+			return files.some(function (file) {
+				return endsWith(file, fileToFind);
+			});
+		});
+		t.true(allFilesFound);
+		t.is(files.length, 5);
+		t.end();
+	});
+});
+
+function endsWith(str, suffix) {
+	return str.indexOf(suffix, str.length - suffix.length) !== -1;
+}
diff --git a/test/fixture/ava-files/default-patterns/sub/directory/__tests__/foo.js b/test/fixture/ava-files/default-patterns/sub/directory/__tests__/foo.js
new file mode 100644
index 000000000..8b1a39374
--- /dev/null
+++ b/test/fixture/ava-files/default-patterns/sub/directory/__tests__/foo.js
@@ -0,0 +1 @@
+// empty
diff --git a/test/fixture/ava-files/default-patterns/sub/directory/bar.test.js b/test/fixture/ava-files/default-patterns/sub/directory/bar.test.js
new file mode 100644
index 000000000..8b1a39374
--- /dev/null
+++ b/test/fixture/ava-files/default-patterns/sub/directory/bar.test.js
@@ -0,0 +1 @@
+// empty
diff --git a/test/fixture/ava-files/default-patterns/test-foo.js b/test/fixture/ava-files/default-patterns/test-foo.js
new file mode 100644
index 000000000..8b1a39374
--- /dev/null
+++ b/test/fixture/ava-files/default-patterns/test-foo.js
@@ -0,0 +1 @@
+// empty
diff --git a/test/fixture/ava-files/default-patterns/test.js b/test/fixture/ava-files/default-patterns/test.js
new file mode 100644
index 000000000..8b1a39374
--- /dev/null
+++ b/test/fixture/ava-files/default-patterns/test.js
@@ -0,0 +1 @@
+// empty
diff --git a/test/fixture/ava-files/default-patterns/test/baz.js b/test/fixture/ava-files/default-patterns/test/baz.js
new file mode 100644
index 000000000..8b1a39374
--- /dev/null
+++ b/test/fixture/ava-files/default-patterns/test/baz.js
@@ -0,0 +1 @@
+// empty