diff --git a/pkg/serverconfig/serverconfig_test.go b/pkg/serverconfig/serverconfig_test.go
index 1285f9bd4..e488a774f 100644
--- a/pkg/serverconfig/serverconfig_test.go
+++ b/pkg/serverconfig/serverconfig_test.go
@@ -122,13 +122,13 @@ func testConfig(name string, t *testing.T) {
 	}
 	lowLevelConf, err := serverconfig.GenLowLevelConfig(&serverconfig.Config{Obj: obj})
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("test %s: GenLowLevelConfig: %v", name, err)
 	}
 	baseName := strings.Replace(filepath.Base(name), ".json", "", 1)
 	wantFile := strings.Replace(name, ".json", "-want.json", 1)
 	wantConf, err := configParser().ReadFile(wantFile)
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("test %s: ReadFile: %v", name, err)
 	}
 	var got, want bytes.Buffer
 	prettyPrint(&got, lowLevelConf.Obj, 0)
@@ -140,10 +140,10 @@ func testConfig(name string, t *testing.T) {
 		defer os.Remove(tempWant.Name())
 		diff, err := exec.Command("diff", "-u", tempWant.Name(), tempGot.Name()).Output()
 		if err != nil {
-			t.Logf("diff failure: %v", err)
+			t.Logf("test %s diff failure: %v", name, err)
 		}
-		t.Errorf("Configurations differ.\nGot:\n%s\nWant:\n%s\nDiff:\n%s",
-			&got, &want, diff)
+		t.Errorf("test %s configurations differ.\nGot:\n%s\nWant:\n%s\nDiff:\n%s",
+			name, &got, &want, diff)
 	}
 }
 
diff --git a/pkg/serverconfig/testdata/default-want.json b/pkg/serverconfig/testdata/default-want.json
index 2cffc7d11..c959c1770 100644
--- a/pkg/serverconfig/testdata/default-want.json
+++ b/pkg/serverconfig/testdata/default-want.json
@@ -1,6 +1,5 @@
 {
 	"listen": "localhost:3179",
-	"baseURL": "http://localhost:3179",
 	"auth": "userpass:camlistore:pass3179",
 	"https": false,
 	"prefixes": {
diff --git a/pkg/serverconfig/testdata/default.json b/pkg/serverconfig/testdata/default.json
index 3e66db353..3f41b9aa0 100644
--- a/pkg/serverconfig/testdata/default.json
+++ b/pkg/serverconfig/testdata/default.json
@@ -1,6 +1,6 @@
 {
 	"listen": "localhost:3179",
-	"TLS": false,
+	"https": false,
 	"auth": "userpass:camlistore:pass3179",
 	"blobPath": "/tmp/blobs",
 	"identity": "26F5ABDA",
diff --git a/pkg/serverconfig/testdata/tls-want.json b/pkg/serverconfig/testdata/tls-want.json
index 2c0c6ec8b..d73dcde23 100644
--- a/pkg/serverconfig/testdata/tls-want.json
+++ b/pkg/serverconfig/testdata/tls-want.json
@@ -1,6 +1,5 @@
 {
 	"listen": "1.2.3.4:443",
-	"baseURL": "https://1.2.3.4:443",
 	"auth": "userpass:camlistore:pass3179",
 	"https": true,
         "TLSCertFile": "/tls.crt",
diff --git a/pkg/serverconfig/testdata/tls.json b/pkg/serverconfig/testdata/tls.json
index ee15924b7..a2dad11c9 100644
--- a/pkg/serverconfig/testdata/tls.json
+++ b/pkg/serverconfig/testdata/tls.json
@@ -1,8 +1,8 @@
 {
 	"listen": "1.2.3.4:443",
-	"TLS": true,
-	"TLSCertFile": "/tls.crt",
-	"TLSKeyFile": "/tls.key",
+	"https": true,
+	"HTTPSCertFile": "/tls.crt",
+	"HTTPSKeyFile": "/tls.key",
 	"auth": "userpass:camlistore:pass3179",
 	"blobPath": "/tmp/blobs",
 	"identity": "26F5ABDA",
diff --git a/pkg/serverconfig/testdata/with_blog-want.json b/pkg/serverconfig/testdata/with_blog-want.json
index 57ed3a204..f5301419f 100644
--- a/pkg/serverconfig/testdata/with_blog-want.json
+++ b/pkg/serverconfig/testdata/with_blog-want.json
@@ -1,6 +1,5 @@
 {
 	"listen": "localhost:3179",
-	"baseURL": "http://localhost:3179",
 	"auth": "userpass:camlistore:pass3179",
 	"https": false,
 	"prefixes": {
diff --git a/pkg/serverconfig/testdata/with_blog.json b/pkg/serverconfig/testdata/with_blog.json
index b7dd9cb8c..8867dc361 100644
--- a/pkg/serverconfig/testdata/with_blog.json
+++ b/pkg/serverconfig/testdata/with_blog.json
@@ -1,6 +1,6 @@
 {
 	"listen": "localhost:3179",
-	"TLS": false,
+	"https": false,
 	"auth": "userpass:camlistore:pass3179",
 	"blobPath": "/tmp/blobs",
 	"identity": "26F5ABDA",
diff --git a/pkg/serverconfig/testdata/with_gallery-want.json b/pkg/serverconfig/testdata/with_gallery-want.json
index 75a0ef693..77e5aa2ad 100644
--- a/pkg/serverconfig/testdata/with_gallery-want.json
+++ b/pkg/serverconfig/testdata/with_gallery-want.json
@@ -1,6 +1,5 @@
 {
 	"listen": "localhost:3179",
-	"baseURL": "http://localhost:3179",
 	"auth": "userpass:camlistore:pass3179",
 	"https": false,
 	"prefixes": {
diff --git a/pkg/serverconfig/testdata/with_gallery.json b/pkg/serverconfig/testdata/with_gallery.json
index 986d773f0..c2328fd24 100644
--- a/pkg/serverconfig/testdata/with_gallery.json
+++ b/pkg/serverconfig/testdata/with_gallery.json
@@ -1,6 +1,6 @@
 {
 	"listen": "localhost:3179",
-	"TLS": false,
+	"https": false,
 	"auth": "userpass:camlistore:pass3179",
 	"blobPath": "/tmp/blobs",
 	"identity": "26F5ABDA",