--- a/config_test.go	Mon Apr 10 23:47:46 2017 +0200
+++ b/config_test.go	Mon Apr 10 23:47:57 2017 +0200
@@ -13,6 +13,9 @@
 	_, err := loadGlobal(filepath.Join("test", "non.toml"))
 	assert.Error(t, err, "does not exist")
 
+	_, err = loadGlobal(filepath.Join("test", "garbage.token"))
+	assert.Error(t, err, "just garbage")
+
 	// git does now allow you to checkin 000 files :(
 	err = os.Chmod(filepath.Join("test", "perms.toml"), 000)
 	_, err = loadGlobal(filepath.Join("test", "perms.toml"))
@@ -43,7 +46,7 @@
 func TestGetInstanceList(t *testing.T) {
 	baseDir = "test"
 
-	real := []string{"test/foo.token"}
+	real := []string{"test/foo.token", "test/garbage.token"}
 	list := GetInstanceList()
 	assert.Equal(t, real, list, "equal")
 
@@ -51,4 +54,9 @@
 	real = nil
 	list = GetInstanceList()
 	assert.Equal(t, real, list, "equal")
+
+	baseDir = "/nonexistent"
+	real = nil
+	list = GetInstanceList()
+	assert.Equal(t, real, list, "equal")
 }