diff --git a/session/environment_test.go b/session/environment_test.go
index 3b6b0fa0..33194e73 100644
--- a/session/environment_test.go
+++ b/session/environment_test.go
@@ -70,7 +70,7 @@ func TestSessionEnvironmentWithEmptyFile(t *testing.T) {
 	defer teardown(t)
 
 	if env, err := NewEnvironment(testEnvFile); env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if len(env.Data) != 0 {
@@ -83,7 +83,7 @@ func TestSessionEnvironmentWithDataFile(t *testing.T) {
 	defer teardown(t)
 
 	if env, err := NewEnvironment(testEnvFile); env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if len(env.Data) != len(testEnvData) {
@@ -98,7 +98,7 @@ func TestSessionEnvironmentSaveWithError(t *testing.T) {
 	defer teardown(t)
 
 	if env, err := NewEnvironment(testEnvFile); env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if err = env.Save("/lulz/nope"); err == nil {
@@ -112,7 +112,7 @@ func TestSessionEnvironmentSave(t *testing.T) {
 
 	env, err := NewEnvironment(testEnvFile)
 	if env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -137,7 +137,7 @@ func TestSessionEnvironmentHas(t *testing.T) {
 
 	env, err := NewEnvironment(testEnvFile)
 	if env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if len(env.Data) != len(testEnvData) {
@@ -163,7 +163,7 @@ func TestSessionEnvironmentSet(t *testing.T) {
 
 	env, err := NewEnvironment(testEnvFile)
 	if env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if old := env.Set("people", "ok"); old != "shit" {
@@ -183,7 +183,7 @@ func TestSessionEnvironmentSetWithCallback(t *testing.T) {
 
 	env, err := NewEnvironment(testEnvFile)
 	if env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -217,7 +217,7 @@ func TestSessionEnvironmentGet(t *testing.T) {
 
 	env, err := NewEnvironment(testEnvFile)
 	if env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if len(env.Data) != len(testEnvData) {
@@ -245,7 +245,7 @@ func TestSessionEnvironmentGetInt(t *testing.T) {
 
 	env, err := NewEnvironment(testEnvFile)
 	if env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if len(env.Data) != len(testEnvData) {
@@ -276,7 +276,7 @@ func TestSessionEnvironmentSorted(t *testing.T) {
 
 	env, err := NewEnvironment(testEnvFile)
 	if env == nil {
-		t.Fatal("expected environment")
+		t.Fatalf("expected environment: %v", err)
 	} else if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if len(env.Data) != len(testEnvData) {