diff --git a/deb/deb_test.go b/deb/deb_test.go
index bb1b0a42e2..4c329c0405 100644
--- a/deb/deb_test.go
+++ b/deb/deb_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type DebSuite struct {
diff --git a/deb/import.go b/deb/import.go
index 971a17e639..ceea8ff9c0 100644
--- a/deb/import.go
+++ b/deb/import.go
@@ -100,7 +100,7 @@ func ImportPackageFiles(list *PackageList, packageFiles []string, forceReplace b
 		if isSourcePackage {
 			p.UpdateFiles(append(p.Files(), PackageFile{Filename: filepath.Base(file), Checksums: checksums}))
 		} else {
-			p.UpdateFiles([]PackageFile{PackageFile{Filename: filepath.Base(file), Checksums: checksums}})
+			p.UpdateFiles([]PackageFile{{Filename: filepath.Base(file), Checksums: checksums}})
 		}
 
 		err = pool.Import(file, checksums.MD5)
diff --git a/deb/list_test.go b/deb/list_test.go
index a4d44a8e25..c90754010a 100644
--- a/deb/list_test.go
+++ b/deb/list_test.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type containsChecker struct {
@@ -80,20 +80,20 @@ func (s *PackageListSuite) SetUpTest(c *C) {
 
 	s.il = NewPackageList()
 	s.packages = []*Package{
-		&Package{Name: "lib", Version: "1.0", Architecture: "i386", Source: "lib (0.9)", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"mail-agent"}}},
-		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
-		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all", Source: "app", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
-		&Package{Name: "mailer", Version: "3.5.8", Architecture: "i386", Source: "postfix (1.3)", Provides: []string{"mail-agent"}, deps: &PackageDependencies{}},
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "arm", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9) | libx (>= 1.5)", "data (>= 1.0) | mail-agent"}}},
-		&Package{Name: "app", Version: "1.0", Architecture: "s390", deps: &PackageDependencies{PreDepends: []string{"dpkg >= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
-		&Package{Name: "aa", Version: "2.0-1", Architecture: "i386", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
-		&Package{Name: "dpkg", Version: "1.6.1-3", Architecture: "amd64", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
-		&Package{Name: "libx", Version: "1.5", Architecture: "arm", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
-		&Package{Name: "dpkg", Version: "1.6.1-3", Architecture: "arm", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
-		&Package{Name: "dpkg", Version: "1.6.1-3", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
-		&Package{Name: "dpkg", Version: "1.7", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		{Name: "lib", Version: "1.0", Architecture: "i386", Source: "lib (0.9)", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"mail-agent"}}},
+		{Name: "dpkg", Version: "1.7", Architecture: "i386", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
+		{Name: "data", Version: "1.1~bp1", Architecture: "all", Source: "app", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
+		{Name: "app", Version: "1.1~bp1", Architecture: "i386", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		{Name: "mailer", Version: "3.5.8", Architecture: "i386", Source: "postfix (1.3)", Provides: []string{"mail-agent"}, deps: &PackageDependencies{}},
+		{Name: "app", Version: "1.1~bp1", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		{Name: "app", Version: "1.1~bp1", Architecture: "arm", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9) | libx (>= 1.5)", "data (>= 1.0) | mail-agent"}}},
+		{Name: "app", Version: "1.0", Architecture: "s390", deps: &PackageDependencies{PreDepends: []string{"dpkg >= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		{Name: "aa", Version: "2.0-1", Architecture: "i386", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
+		{Name: "dpkg", Version: "1.6.1-3", Architecture: "amd64", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
+		{Name: "libx", Version: "1.5", Architecture: "arm", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
+		{Name: "dpkg", Version: "1.6.1-3", Architecture: "arm", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
+		{Name: "dpkg", Version: "1.6.1-3", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		{Name: "dpkg", Version: "1.7", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
 	}
 	for _, p := range s.packages {
 		s.il.Add(p)
@@ -102,12 +102,12 @@ func (s *PackageListSuite) SetUpTest(c *C) {
 
 	s.il2 = NewPackageList()
 	s.packages2 = []*Package{
-		&Package{Name: "mailer", Version: "3.5.8", Architecture: "amd64", Source: "postfix (1.3)", Provides: []string{"mail-agent"}, deps: &PackageDependencies{}},
-		&Package{Name: "sendmail", Version: "1.0", Architecture: "amd64", Source: "postfix (1.3)", Provides: []string{"mail-agent"}, deps: &PackageDependencies{}},
-		&Package{Name: "app", Version: "1.1-bp1", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
-		&Package{Name: "app", Version: "1.1-bp2", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
-		&Package{Name: "app", Version: "1.2", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9) | libx (>= 1.5)", "data (>= 1.0) | mail-agent"}}},
-		&Package{Name: "app", Version: "3.0", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg >= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		{Name: "mailer", Version: "3.5.8", Architecture: "amd64", Source: "postfix (1.3)", Provides: []string{"mail-agent"}, deps: &PackageDependencies{}},
+		{Name: "sendmail", Version: "1.0", Architecture: "amd64", Source: "postfix (1.3)", Provides: []string{"mail-agent"}, deps: &PackageDependencies{}},
+		{Name: "app", Version: "1.1-bp1", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		{Name: "app", Version: "1.1-bp2", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		{Name: "app", Version: "1.2", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9) | libx (>= 1.5)", "data (>= 1.0) | mail-agent"}}},
+		{Name: "app", Version: "3.0", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg >= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
 	}
 	for _, p := range s.packages2 {
 		s.il2.Add(p)
@@ -115,10 +115,10 @@ func (s *PackageListSuite) SetUpTest(c *C) {
 	s.il2.PrepareIndex()
 
 	s.sourcePackages = []*Package{
-		&Package{Name: "postfix", Version: "1.3", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
-		&Package{Name: "aa", Version: "2.0-1", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
-		&Package{Name: "lib", Version: "0.9", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		{Name: "postfix", Version: "1.3", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		{Name: "app", Version: "1.1~bp1", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		{Name: "aa", Version: "2.0-1", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		{Name: "lib", Version: "0.9", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
 	}
 
 }
@@ -388,7 +388,7 @@ func (s *PackageListSuite) TestVerifyDependencies(c *C) {
 
 	missing, err = s.il.VerifyDependencies(0, []string{"i386", "amd64"}, s.il, nil)
 	c.Check(err, IsNil)
-	c.Check(missing, DeepEquals, []Dependency{Dependency{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "amd64"}})
+	c.Check(missing, DeepEquals, []Dependency{{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "amd64"}})
 
 	missing, err = s.il.VerifyDependencies(0, []string{"arm"}, s.il, nil)
 	c.Check(err, IsNil)
@@ -396,8 +396,8 @@ func (s *PackageListSuite) TestVerifyDependencies(c *C) {
 
 	missing, err = s.il.VerifyDependencies(DepFollowAllVariants, []string{"arm"}, s.il, nil)
 	c.Check(err, IsNil)
-	c.Check(missing, DeepEquals, []Dependency{Dependency{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "arm"},
-		Dependency{Pkg: "mail-agent", Relation: VersionDontCare, Version: "", Architecture: "arm"}})
+	c.Check(missing, DeepEquals, []Dependency{{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "arm"},
+		{Pkg: "mail-agent", Relation: VersionDontCare, Version: "", Architecture: "arm"}})
 
 	for _, p := range s.sourcePackages {
 		s.il.Add(p)
@@ -405,11 +405,11 @@ func (s *PackageListSuite) TestVerifyDependencies(c *C) {
 
 	missing, err = s.il.VerifyDependencies(DepFollowSource, []string{"i386", "amd64"}, s.il, nil)
 	c.Check(err, IsNil)
-	c.Check(missing, DeepEquals, []Dependency{Dependency{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "amd64"}})
+	c.Check(missing, DeepEquals, []Dependency{{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "amd64"}})
 
 	missing, err = s.il.VerifyDependencies(DepFollowSource, []string{"arm"}, s.il, nil)
 	c.Check(err, IsNil)
-	c.Check(missing, DeepEquals, []Dependency{Dependency{Pkg: "libx", Relation: VersionEqual, Version: "1.5", Architecture: "source"}})
+	c.Check(missing, DeepEquals, []Dependency{{Pkg: "libx", Relation: VersionEqual, Version: "1.5", Architecture: "source"}})
 
 	_, err = s.il.VerifyDependencies(0, []string{"i386", "amd64", "s390"}, s.il, nil)
 	c.Check(err, ErrorMatches, "unable to process package app_1.0_s390:.*")
diff --git a/deb/local_test.go b/deb/local_test.go
index f201b5adc6..ebcce105ce 100644
--- a/deb/local_test.go
+++ b/deb/local_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"github.com/smira/aptly/database"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type LocalRepoSuite struct {
diff --git a/deb/package_collection_test.go b/deb/package_collection_test.go
index 47c72d648c..6ca363d91d 100644
--- a/deb/package_collection_test.go
+++ b/deb/package_collection_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/smira/aptly/database"
 	"github.com/smira/aptly/utils"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type PackageCollectionSuite struct {
diff --git a/deb/package_files_test.go b/deb/package_files_test.go
index 1b635ce71e..fe11193f00 100644
--- a/deb/package_files_test.go
+++ b/deb/package_files_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type PackageFilesSuite struct {
diff --git a/deb/package_test.go b/deb/package_test.go
index 713098f31d..c1dc9829e2 100644
--- a/deb/package_test.go
+++ b/deb/package_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"regexp"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type PackageSuite struct {
@@ -399,7 +399,7 @@ func (s *PackageSuite) TestDownloadList(c *C) {
 	list, err := p.DownloadList(packagePool)
 	c.Check(err, IsNil)
 	c.Check(list, DeepEquals, []PackageDownloadTask{
-		PackageDownloadTask{
+		{
 			RepoURI:         "pool/contrib/a/alien-arena/alien-arena-common_7.40-2_i386.deb",
 			DestinationPath: poolPath,
 			Checksums: utils.ChecksumInfo{Size: 5,
diff --git a/deb/ppa_test.go b/deb/ppa_test.go
index c235a0a548..44bda7c289 100644
--- a/deb/ppa_test.go
+++ b/deb/ppa_test.go
@@ -3,7 +3,7 @@ package deb
 import (
 	"github.com/smira/aptly/utils"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type PpaSuite struct {
diff --git a/deb/publish_test.go b/deb/publish_test.go
index 49cbeaf57d..ab2d8a7d4e 100644
--- a/deb/publish_test.go
+++ b/deb/publish_test.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"path/filepath"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type pathExistsChecker struct {
diff --git a/deb/reflist_test.go b/deb/reflist_test.go
index fefe53026b..17933b38cb 100644
--- a/deb/reflist_test.go
+++ b/deb/reflist_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"github.com/smira/aptly/database"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type PackageRefListSuite struct {
@@ -169,13 +169,13 @@ func (s *PackageRefListSuite) TestDiff(c *C) {
 	coll := NewPackageCollection(db)
 
 	packages := []*Package{
-		&Package{Name: "lib", Version: "1.0", Architecture: "i386"},      //0
-		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386"},     //1
-		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all"},  //2
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386"},  //3
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "i386"},  //4
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "amd64"}, //5
-		&Package{Name: "xyz", Version: "3.0", Architecture: "sparc"},     //6
+		{Name: "lib", Version: "1.0", Architecture: "i386"},      //0
+		{Name: "dpkg", Version: "1.7", Architecture: "i386"},     //1
+		{Name: "data", Version: "1.1~bp1", Architecture: "all"},  //2
+		{Name: "app", Version: "1.1~bp1", Architecture: "i386"},  //3
+		{Name: "app", Version: "1.1~bp2", Architecture: "i386"},  //4
+		{Name: "app", Version: "1.1~bp2", Architecture: "amd64"}, //5
+		{Name: "xyz", Version: "3.0", Architecture: "sparc"},     //6
 	}
 
 	for _, p := range packages {
@@ -241,16 +241,16 @@ func (s *PackageRefListSuite) TestMerge(c *C) {
 	coll := NewPackageCollection(db)
 
 	packages := []*Package{
-		&Package{Name: "lib", Version: "1.0", Architecture: "i386"},                      //0
-		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386"},                     //1
-		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all"},                  //2
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386"},                  //3
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "i386"},                  //4
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "amd64"},                 //5
-		&Package{Name: "dpkg", Version: "1.0", Architecture: "i386"},                     //6
-		&Package{Name: "xyz", Version: "1.0", Architecture: "sparc"},                     //7
-		&Package{Name: "dpkg", Version: "1.0", Architecture: "i386", FilesHash: 0x34445}, //8
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "i386", FilesHash: 0x44}, //9
+		{Name: "lib", Version: "1.0", Architecture: "i386"},                      //0
+		{Name: "dpkg", Version: "1.7", Architecture: "i386"},                     //1
+		{Name: "data", Version: "1.1~bp1", Architecture: "all"},                  //2
+		{Name: "app", Version: "1.1~bp1", Architecture: "i386"},                  //3
+		{Name: "app", Version: "1.1~bp2", Architecture: "i386"},                  //4
+		{Name: "app", Version: "1.1~bp2", Architecture: "amd64"},                 //5
+		{Name: "dpkg", Version: "1.0", Architecture: "i386"},                     //6
+		{Name: "xyz", Version: "1.0", Architecture: "sparc"},                     //7
+		{Name: "dpkg", Version: "1.0", Architecture: "i386", FilesHash: 0x34445}, //8
+		{Name: "app", Version: "1.1~bp2", Architecture: "i386", FilesHash: 0x44}, //9
 	}
 
 	for _, p := range packages {
@@ -320,14 +320,14 @@ func (s *PackageRefListSuite) TestMerge(c *C) {
 
 func (s *PackageRefListSuite) TestFilterLatestRefs(c *C) {
 	packages := []*Package{
-		&Package{Name: "lib", Version: "1.0", Architecture: "i386"},
-		&Package{Name: "lib", Version: "1.2~bp1", Architecture: "i386"},
-		&Package{Name: "lib", Version: "1.2", Architecture: "i386"},
-		&Package{Name: "dpkg", Version: "1.2", Architecture: "i386"},
-		&Package{Name: "dpkg", Version: "1.3", Architecture: "i386"},
-		&Package{Name: "dpkg", Version: "1.3~bp2", Architecture: "i386"},
-		&Package{Name: "dpkg", Version: "1.5", Architecture: "i386"},
-		&Package{Name: "dpkg", Version: "1.6", Architecture: "i386"},
+		{Name: "lib", Version: "1.0", Architecture: "i386"},
+		{Name: "lib", Version: "1.2~bp1", Architecture: "i386"},
+		{Name: "lib", Version: "1.2", Architecture: "i386"},
+		{Name: "dpkg", Version: "1.2", Architecture: "i386"},
+		{Name: "dpkg", Version: "1.3", Architecture: "i386"},
+		{Name: "dpkg", Version: "1.3~bp2", Architecture: "i386"},
+		{Name: "dpkg", Version: "1.5", Architecture: "i386"},
+		{Name: "dpkg", Version: "1.6", Architecture: "i386"},
 	}
 
 	rl := NewPackageList()
diff --git a/deb/remote_test.go b/deb/remote_test.go
index 776a0cd7cb..4bdfbbaf2c 100644
--- a/deb/remote_test.go
+++ b/deb/remote_test.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"sort"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type NullVerifier struct {
diff --git a/deb/snapshot_test.go b/deb/snapshot_test.go
index edbcd703a4..360f9ecb95 100644
--- a/deb/snapshot_test.go
+++ b/deb/snapshot_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"github.com/smira/aptly/database"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type SnapshotSuite struct {
diff --git a/files/package_pool_test.go b/files/package_pool_test.go
index 6025941e29..0f636d90be 100644
--- a/files/package_pool_test.go
+++ b/files/package_pool_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type PackagePoolSuite struct {
diff --git a/files/public_test.go b/files/public_test.go
index 5648c14219..f613b37d10 100644
--- a/files/public_test.go
+++ b/files/public_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type PublishedStorageSuite struct {
diff --git a/http/download_test.go b/http/download_test.go
index ed61e3febe..d5eda5b46f 100644
--- a/http/download_test.go
+++ b/http/download_test.go
@@ -14,7 +14,7 @@ import (
 	"runtime"
 	"time"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type DownloaderSuite struct {
@@ -211,9 +211,9 @@ func (s *DownloaderSuite) TestDownloadTryCompression(c *C) {
 	var buf []byte
 
 	expectedChecksums := map[string]utils.ChecksumInfo{
-		"file.bz2": utils.ChecksumInfo{Size: int64(len(bzipData))},
-		"file.gz":  utils.ChecksumInfo{Size: int64(len(gzipData))},
-		"file":     utils.ChecksumInfo{Size: int64(len(rawData))},
+		"file.bz2": {Size: int64(len(bzipData))},
+		"file.gz":  {Size: int64(len(gzipData))},
+		"file":     {Size: int64(len(rawData))},
 	}
 
 	// bzip2 only available
@@ -278,6 +278,6 @@ func (s *DownloaderSuite) TestDownloadTryCompressionErrors(c *C) {
 	d.ExpectError("http://example.com/file.bz2", &HTTPError{Code: 404})
 	d.ExpectError("http://example.com/file.gz", &HTTPError{Code: 404})
 	d.ExpectResponse("http://example.com/file", rawData)
-	_, _, err = DownloadTryCompression(d, "http://example.com/file", map[string]utils.ChecksumInfo{"file": utils.ChecksumInfo{Size: 7}}, false)
+	_, _, err = DownloadTryCompression(d, "http://example.com/file", map[string]utils.ChecksumInfo{"file": {Size: 7}}, false)
 	c.Assert(err, ErrorMatches, "checksums don't match.*")
 }
diff --git a/http/http_test.go b/http/http_test.go
index fae98be2fa..2c2d087db2 100644
--- a/http/http_test.go
+++ b/http/http_test.go
@@ -3,7 +3,7 @@ package http
 import (
 	"testing"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests
diff --git a/query/lex_test.go b/query/lex_test.go
index 37e34c4021..27d8b04b1e 100644
--- a/query/lex_test.go
+++ b/query/lex_test.go
@@ -3,7 +3,7 @@ package query
 import (
 	"fmt"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type LexerSuite struct {
diff --git a/query/query_test.go b/query/query_test.go
index 77a8f1c2dd..2097c7ab56 100644
--- a/query/query_test.go
+++ b/query/query_test.go
@@ -3,7 +3,7 @@ package query
 import (
 	"testing"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests
diff --git a/query/syntax_test.go b/query/syntax_test.go
index 32ef0edb23..b3d5ce4125 100644
--- a/query/syntax_test.go
+++ b/query/syntax_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/smira/aptly/deb"
 	"regexp"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type SyntaxSuite struct {
diff --git a/s3/public_test.go b/s3/public_test.go
index e10df56cd8..0f6d222126 100644
--- a/s3/public_test.go
+++ b/s3/public_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type PublishedStorageSuite struct {
diff --git a/s3/s3_test.go b/s3/s3_test.go
index 3998d887e8..9c45fab006 100644
--- a/s3/s3_test.go
+++ b/s3/s3_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests
diff --git a/swift/swift_test.go b/swift/swift_test.go
index 1ba91de9ee..4ca59a2b37 100644
--- a/swift/swift_test.go
+++ b/swift/swift_test.go
@@ -3,7 +3,7 @@ package swift
 import (
 	"testing"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests
diff --git a/utils/checksum_test.go b/utils/checksum_test.go
index e31396facb..b2ff1ecaa4 100644
--- a/utils/checksum_test.go
+++ b/utils/checksum_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type ChecksumSuite struct {
diff --git a/utils/compress_test.go b/utils/compress_test.go
index 82d48b1402..6539ce6ecf 100644
--- a/utils/compress_test.go
+++ b/utils/compress_test.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type CompressSuite struct {
diff --git a/utils/config_test.go b/utils/config_test.go
index 2745a5f39f..a90650df52 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type ConfigSuite struct {
@@ -30,11 +30,11 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
 
 	s.config.RootDir = "/tmp/aptly"
 	s.config.DownloadConcurrency = 5
-	s.config.S3PublishRoots = map[string]S3PublishRoot{"test": S3PublishRoot{
+	s.config.S3PublishRoots = map[string]S3PublishRoot{"test": {
 		Region: "us-east-1",
 		Bucket: "repo"}}
 
-	s.config.SwiftPublishRoots = map[string]SwiftPublishRoot{"test": SwiftPublishRoot{
+	s.config.SwiftPublishRoots = map[string]SwiftPublishRoot{"test": {
 		Container: "repo"}}
 
 	err := SaveConfig(configname, &s.config)
@@ -75,7 +75,7 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
 		"      \"plusWorkaround\": false\n"+
 		"    }\n"+
 		"  },\n"+
-                "  \"SwiftPublishEndpoints\": {\n" +
+		"  \"SwiftPublishEndpoints\": {\n"+
 		"    \"test\": {\n"+
 		"      \"osname\": \"\",\n"+
 		"      \"password\": \"\",\n"+
diff --git a/utils/human_test.go b/utils/human_test.go
index d1ef09fd49..9e54bafc8a 100644
--- a/utils/human_test.go
+++ b/utils/human_test.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type HumanSuite struct{}
diff --git a/utils/list_test.go b/utils/list_test.go
index b16e5aefed..fa2114aecf 100644
--- a/utils/list_test.go
+++ b/utils/list_test.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 type ListSuite struct {
diff --git a/utils/utils_test.go b/utils/utils_test.go
index 2832292c9a..65cd670678 100644
--- a/utils/utils_test.go
+++ b/utils/utils_test.go
@@ -3,7 +3,7 @@ package utils
 import (
 	"testing"
 
-  . "gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests