diff --git a/build/deps.sh b/build/deps.sh
index 928b845d690ce4d89e804510cd4f5aae4824ca1c..1e31520857b6eedf1bb938f4a756e61d1f629508 100755
--- a/build/deps.sh
+++ b/build/deps.sh
@@ -5,5 +5,6 @@ go get -u github.com/golang/protobuf/proto
 go get -u github.com/golang/protobuf/protoc-gen-go
 go get -u google.golang.org/grpc
 go get -u github.com/pborman/uuid
-go get -u github.com/bmizerany/assert
+go get -u github.com/stretchr/testify/assert
 go get -u golang.org/x/crypto/ssh/terminal
+
diff --git a/dfssc/common/common_test.go b/dfssc/common/common_test.go
index a62b070bd38259fb173c93b2c2fb876d733e0898..5236b0650779c0c643ab9bff2c5e4b1081075cb1 100644
--- a/dfssc/common/common_test.go
+++ b/dfssc/common/common_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 var path = os.TempDir()
@@ -38,27 +38,27 @@ func TestSaveToDisk(t *testing.T) {
 	data[1] = 'o'
 	data[2] = 'o'
 	err := SaveToDisk(data, ffoo)
-	assert.T(t, err == nil, "An error has been raised")
+	assert.True(t, err == nil, "An error has been raised")
 
-	assert.T(t, FileExists(ffoo), "foo.txt should be present")
+	assert.True(t, FileExists(ffoo), "foo.txt should be present")
 }
 
 // Save a string on the disk
 func TestSaveStringToDisk(t *testing.T) {
 	s := "bar"
 	err := SaveStringToDisk(s, fbar)
-	assert.T(t, err == nil, "An error has been raised")
+	assert.True(t, err == nil, "An error has been raised")
 
-	assert.T(t, FileExists(fbar), "bar.txt should be present")
+	assert.True(t, FileExists(fbar), "bar.txt should be present")
 }
 
 // DeleteQuietly should never raise an error, even with non-existant file
 func TestDeleteQuietly(t *testing.T) {
 	s := "baz"
 	_ = SaveStringToDisk(s, fbaz)
-	assert.T(t, FileExists(fbaz), "baz.txt should be present")
+	assert.True(t, FileExists(fbaz), "baz.txt should be present")
 	DeleteQuietly(fbaz)
-	assert.T(t, !FileExists(fbaz), "baz.txt should not be present")
+	assert.True(t, !FileExists(fbaz), "baz.txt should not be present")
 
 	// Assert it does not panic when deleting an inexistant file
 	DeleteQuietly("dummy")
@@ -68,12 +68,12 @@ func TestDeleteQuietly(t *testing.T) {
 func TestReadFile(t *testing.T) {
 	s := "qux"
 	_ = SaveStringToDisk(s, fqux)
-	assert.T(t, FileExists(fqux), "qux.txt should be present")
+	assert.True(t, FileExists(fqux), "qux.txt should be present")
 
 	data, err := ReadFile(fqux)
 	if err != nil {
 		fmt.Println(err.Error())
-		assert.T(t, err == nil, "An error has been raised while reading the file")
+		assert.True(t, err == nil, "An error has been raised while reading the file")
 	}
 	assert.Equal(t, s, fmt.Sprintf("%s", data), "Expected qux, received ", fmt.Sprintf("%s", data))
 
diff --git a/dfssc/common/errors_test.go b/dfssc/common/errors_test.go
index 73378fa95280998de2b1cd770b846e7e5ec416f9..dc878fa2400c1718ae871583abc307f9193723cd 100644
--- a/dfssc/common/errors_test.go
+++ b/dfssc/common/errors_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"dfss/dfssp/api"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestEvaluateErrorCodeResponse(t *testing.T) {
diff --git a/dfssc/common/file_test.go b/dfssc/common/file_test.go
index 4d55a5adbbefe8f602e2758a8ec4ebdd99eded30..691252f4716daf254b776bdf939eab3613954ad3 100644
--- a/dfssc/common/file_test.go
+++ b/dfssc/common/file_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestUnmarshalDFSSFile(t *testing.T) {
diff --git a/dfssc/common/sequence_analysis_test.go b/dfssc/common/sequence_analysis_test.go
index e8cdd67c01de823ad39cb8bcc6566cc378850c9a..b1124409d5d1dad73111f6eab4d012953c78eff2 100644
--- a/dfssc/common/sequence_analysis_test.go
+++ b/dfssc/common/sequence_analysis_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestFindNextIndex(t *testing.T) {
diff --git a/dfssc/security/security_test.go b/dfssc/security/security_test.go
index ba6ea1f5af1ec14f5ebd54c845a27b629c59514f..2a9c6440d547cb23203e4170e2ea83707f95e070 100644
--- a/dfssc/security/security_test.go
+++ b/dfssc/security/security_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 var crtFixture = `-----BEGIN CERTIFICATE-----
@@ -34,9 +34,9 @@ func TestGenerateKeys(t *testing.T) {
 	fkey := filepath.Join(path, "genKey.pem")
 
 	rsa, err := GenerateKeys(512, "pwd", fkey)
-	assert.T(t, err == nil, "An error has been raised during generation")
-	assert.T(t, rsa != nil, "RSA key should not be nil")
-	assert.T(t, common.FileExists(fkey), "File is missing")
+	assert.True(t, err == nil, "An error has been raised during generation")
+	assert.True(t, rsa != nil, "RSA key should not be nil")
+	assert.True(t, common.FileExists(fkey), "File is missing")
 	common.DeleteQuietly(fkey)
 }
 
@@ -46,13 +46,13 @@ func TestCertificateRequest(t *testing.T) {
 
 	rsa, err := GenerateKeys(512, "pwd", fkey)
 	defer common.DeleteQuietly(fkey)
-	assert.T(t, err == nil, "An error has been raised during generation")
-	assert.T(t, rsa != nil, "RSA key should not be nil")
-	assert.T(t, common.FileExists(fkey), "File is missing")
+	assert.True(t, err == nil, "An error has been raised during generation")
+	assert.True(t, rsa != nil, "RSA key should not be nil")
+	assert.True(t, common.FileExists(fkey), "File is missing")
 
 	csr, err := GenerateCertificateRequest("France", "DFSS", "DFSS_C", "dfssc@dfss.org", rsa)
-	assert.T(t, err == nil, "An error has been raised during generation of certificate request")
-	assert.T(t, csr != "", "Certificate request should not be nil")
+	assert.True(t, err == nil, "An error has been raised during generation of certificate request")
+	assert.True(t, csr != "", "Certificate request should not be nil")
 }
 
 // Test saving rsa key on the disk
@@ -62,18 +62,18 @@ func TestDumpingKey(t *testing.T) {
 	rsa, err := GenerateKeys(512, "pwd", fkey)
 	defer common.DeleteQuietly(fkey)
 
-	assert.T(t, err == nil, "An error has been raised during generation")
-	assert.T(t, rsa != nil, "RSA key should not be nil")
-	assert.T(t, common.FileExists(fkey), "File is missing")
+	assert.True(t, err == nil, "An error has been raised during generation")
+	assert.True(t, rsa != nil, "RSA key should not be nil")
+	assert.True(t, common.FileExists(fkey), "File is missing")
 
 	k, err := GetPrivateKey(fkey, "")
-	assert.T(t, err != nil, "An error should have been raised")
+	assert.True(t, err != nil, "An error should have been raised")
 
 	k, err = GetPrivateKey(fkey, "dummypwd")
-	assert.T(t, err != nil, "An error should have been raised")
+	assert.True(t, err != nil, "An error should have been raised")
 
 	k, err = GetPrivateKey(fkey, "pwd")
-	assert.T(t, err == nil, "No error should have been raised")
+	assert.True(t, err == nil, "No error should have been raised")
 	assert.Equal(t, *rsa, *k, "Keys should be equal")
 
 }
@@ -85,14 +85,14 @@ func TestDumpCrt(t *testing.T) {
 	err := SaveCertificate(crtFixture, fcert)
 	defer common.DeleteQuietly(fcert)
 
-	assert.T(t, err == nil, "An error has been raised during saving")
-	assert.T(t, common.FileExists(fcert), "File is missing")
+	assert.True(t, err == nil, "An error has been raised during saving")
+	assert.True(t, common.FileExists(fcert), "File is missing")
 
 	data, err := common.ReadFile(fcert)
-	assert.T(t, err == nil, "An error has been raised while reading file")
+	assert.True(t, err == nil, "An error has been raised while reading file")
 	assert.Equal(t, crtFixture, fmt.Sprintf("%s", data), "Certificates are not equal")
 
 	crt, err := GetCertificate(fcert)
-	assert.T(t, err == nil, "An error has been raised while parsing certificate")
-	assert.T(t, crt != nil, "Certificate is nil")
+	assert.True(t, err == nil, "An error has been raised while parsing certificate")
+	assert.True(t, crt != nil, "Certificate is nil")
 }
diff --git a/dfssc/sign/create_test.go b/dfssc/sign/create_test.go
index 4aa1a5988f4cfbce4831d9d5244742ba8f010d74..bcd630b7edf652be7c732edeeb9c7911b689545b 100644
--- a/dfssc/sign/create_test.go
+++ b/dfssc/sign/create_test.go
@@ -10,7 +10,7 @@ import (
 
 	"dfss/auth"
 	"dfss/mockp/server"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 var path = filepath.Join("..", "testdata")
diff --git a/dfssc/sign/fetch_test.go b/dfssc/sign/fetch_test.go
index b087f34108c96f681f9c2b9f6335a8e47e5b99b4..73a0830fad28a892de4b2fbd349a8bef0b2eb51f 100644
--- a/dfssc/sign/fetch_test.go
+++ b/dfssc/sign/fetch_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestFetchContract(t *testing.T) {
diff --git a/dfssc/sign/starter_test.go b/dfssc/sign/starter_test.go
index ec8401c983999b623cf1f905ae259cc001f6b7f4..cb642b1a718c4c45bebbf608b39743fa0c2c4774 100644
--- a/dfssc/sign/starter_test.go
+++ b/dfssc/sign/starter_test.go
@@ -5,7 +5,7 @@ import (
 
 	"dfss/dfssp/contract"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestFindId(t *testing.T) {
diff --git a/dfssc/user/authentication_test.go b/dfssc/user/authentication_test.go
index 86f40521de022a3cc36afd82153cfd39b4c20012..3bd00981acabc3c33c26a77e0d0c176051281451 100644
--- a/dfssc/user/authentication_test.go
+++ b/dfssc/user/authentication_test.go
@@ -3,23 +3,23 @@ package user
 import (
 	"dfss/dfssc/common"
 	"fmt"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
 )
 
 func TestAuthenticationValidation(t *testing.T) {
 	_, err := NewAuthManager("fca", fcert, addrPort, "dummy", "token")
-	assert.T(t, err != nil, "Email is invalid")
+	assert.True(t, err != nil, "Email is invalid")
 
 	f, _ := os.Create(fcert)
 	_ = f.Close()
 	_, err = NewAuthManager("fca", fcert, addrPort, "mail@mail.mail", "token")
-	assert.T(t, err != nil, "Cert file already there")
+	assert.True(t, err != nil, "Cert file already there")
 
 	_ = os.Remove(fcert)
 	_, err = NewAuthManager("fca", fcert, addrPort, "mail@mail.mail", "token")
-	assert.T(t, err != nil, "CA file not there")
+	assert.True(t, err != nil, "CA file not there")
 
 	_, err = NewAuthManager(fca, fcert, addrPort, "mail@mail.mail", "token")
 	assert.Equal(t, err, nil)
diff --git a/dfssc/user/config_test.go b/dfssc/user/config_test.go
index 2c1f9b46e60bd3acb906203710efd27242cc5a2e..dc814e5f7c181185ad25a7006f4a7c4ca2f0e84a 100644
--- a/dfssc/user/config_test.go
+++ b/dfssc/user/config_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 const certFixture = `-----BEGIN CERTIFICATE-----
@@ -46,15 +46,15 @@ func TestInvalidFiles(t *testing.T) {
 	defer deleteFiles(keyFile, certFile, "invalidConf.pem")
 
 	_, err := NewConfig("inexistantKey", "inexistantCert")
-	assert.Tf(t, err != nil, "No key file nor cert file, expected error")
+	assert.True(t, err != nil, "No key file nor cert file, expected error")
 
 	_ = common.SaveStringToDisk(fmt.Sprintf("%s", []byte(keyFixture)), keyFile)
 	_, err = NewConfig(keyFile, "inexistantCert")
-	assert.Tf(t, err != nil, "No cert file, expected error")
+	assert.True(t, err != nil, "No cert file, expected error")
 
 	_ = security.SaveCertificate(fmt.Sprintf("%s", []byte(certFixture)), certFile)
 	_, err = NewConfig(keyFile, certFile)
-	assert.Tf(t, err == nil, "Expected no error, files are present and valid")
+	assert.True(t, err == nil, "Expected no error, files are present and valid")
 }
 
 // TestErrorDumpingConfig checks the error that may be raised while dumping the configuration to the disk
@@ -64,25 +64,25 @@ func TestErrorDumpingConfig(t *testing.T) {
 	defer deleteFiles(keyFile, certFile, "invalidConf.pem")
 
 	err := common.SaveStringToDisk(fmt.Sprintf("%s", []byte(keyFixture)), keyFile)
-	assert.Tf(t, err == nil, "Expected no error, file is present")
+	assert.True(t, err == nil, "Expected no error, file is present")
 
 	err = security.SaveCertificate(fmt.Sprintf("%s", []byte(certFixture)), certFile)
-	assert.Tf(t, err == nil, "Expected no error, cert is valid")
+	assert.True(t, err == nil, "Expected no error, cert is valid")
 
 	config, err := NewConfig(keyFile, certFile)
-	assert.Tf(t, err == nil, "Expected no error, files are present and valid")
+	assert.True(t, err == nil, "Expected no error, files are present and valid")
 
 	err = config.SaveConfigToFile("file", "abc", "")
-	assert.Tf(t, err != nil, "Expected an error, passphrase is too short (< 4 char)")
+	assert.True(t, err != nil, "Expected an error, passphrase is too short (< 4 char)")
 
 	err = config.SaveConfigToFile(keyFile, "passphrase", "")
-	assert.Tf(t, err != nil, "Expected an error, file is already there")
+	assert.True(t, err != nil, "Expected an error, file is already there")
 
 	common.DeleteQuietly(keyFile)
 	_ = common.SaveStringToDisk("Invalid key", keyFile)
 	config, _ = NewConfig(keyFile, certFile)
 	err = config.SaveConfigToFile("file", "passphrase", "passphrase")
-	assert.Tf(t, err != nil, "Expected an error, private key is invalid")
+	assert.True(t, err != nil, "Expected an error, private key is invalid")
 
 	common.DeleteQuietly(certFile)
 	common.DeleteQuietly(keyFile)
@@ -90,7 +90,7 @@ func TestErrorDumpingConfig(t *testing.T) {
 	_ = common.SaveStringToDisk("Invalid certificate", certFile)
 	config, _ = NewConfig(keyFile, certFile)
 	err = config.SaveConfigToFile("file", "passphrase", "passphrase")
-	assert.Tf(t, err != nil, "Expected an error, certificate is invalid")
+	assert.True(t, err != nil, "Expected an error, certificate is invalid")
 
 }
 
@@ -103,21 +103,21 @@ func TestDumpingFile(t *testing.T) {
 	defer deleteFiles(keyFile, certFile, configPath)
 
 	err := common.SaveStringToDisk(fmt.Sprintf("%s", []byte(keyFixture)), keyFile)
-	assert.Tf(t, err == nil, "Expected no error, file is present")
+	assert.True(t, err == nil, "Expected no error, file is present")
 
 	err = security.SaveCertificate(fmt.Sprintf("%s", []byte(certFixture)), certFile)
-	assert.Tf(t, err == nil, "Expected no error, cert is valid")
+	assert.True(t, err == nil, "Expected no error, cert is valid")
 
 	config, err := NewConfig(keyFile, certFile)
-	assert.Tf(t, err == nil, "Expected no error, files are present and valid")
+	assert.True(t, err == nil, "Expected no error, files are present and valid")
 
 	err = config.SaveConfigToFile(configPath, "passphrase", "")
-	assert.Tf(t, err == nil, "Expected no error, config is valid")
+	assert.True(t, err == nil, "Expected no error, config is valid")
 
-	assert.Tf(t, common.FileExists(configPath), "Expected a config file present")
+	assert.True(t, common.FileExists(configPath), "Expected a config file present")
 	_, err = common.ReadFile(configPath)
 
-	assert.Tf(t, err == nil, "Expected no error, config is present")
+	assert.True(t, err == nil, "Expected no error, config is present")
 }
 
 // TestErrorDecodeFile tries to decode a configuration file and checks the errors raised
@@ -132,19 +132,19 @@ func TestErrorDecodeFile(t *testing.T) {
 	_ = security.SaveCertificate(fmt.Sprintf("%s", []byte(certFixture)), certFile)
 
 	_, err := DecodeConfiguration("inexistantFile", "passphrase", "")
-	assert.Tf(t, err != nil, "File is invalid, impossible to decode configuration")
+	assert.True(t, err != nil, "File is invalid, impossible to decode configuration")
 
 	_, err = DecodeConfiguration(keyFile, "pas", "")
-	assert.Tf(t, err != nil, "Passphrase is invalid, should be at least 4 char long")
+	assert.True(t, err != nil, "Passphrase is invalid, should be at least 4 char long")
 
 	config, err := NewConfig(keyFile, certFile)
-	assert.Tf(t, err == nil, "Expected no error, files are present and valid")
+	assert.True(t, err == nil, "Expected no error, files are present and valid")
 
 	err = config.SaveConfigToFile(configPath, "passphrase", "")
-	assert.Tf(t, err == nil, "Expected no error, config is valid")
+	assert.True(t, err == nil, "Expected no error, config is valid")
 
 	config, err = DecodeConfiguration(configPath, "pass", "")
-	assert.Tf(t, err != nil, "Expected error, wrong passphrase")
+	assert.True(t, err != nil, "Expected error, wrong passphrase")
 
 }
 
@@ -160,18 +160,18 @@ func TestDecodeConfig(t *testing.T) {
 	_ = security.SaveCertificate(fmt.Sprintf("%s", []byte(certFixture)), certFile)
 
 	config, err := NewConfig(keyFile, certFile)
-	assert.Tf(t, err == nil, "Expected no error, files are present and valid")
+	assert.True(t, err == nil, "Expected no error, files are present and valid")
 
 	err = config.SaveConfigToFile(configPath, "passphrase", "")
-	assert.Tf(t, err == nil, "Expected no error, config is valid")
+	assert.True(t, err == nil, "Expected no error, config is valid")
 
 	decoded, err := DecodeConfiguration(configPath, "", "passphrase")
-	assert.Tf(t, err == nil, "Expected no error, config should have been decodedi")
+	assert.True(t, err == nil, "Expected no error, config should have been decodedi")
 
-	assert.Equalf(t, config.KeyFile, decoded.KeyFile, "Wrong keyFile parameter")
-	assert.Equalf(t, config.KeyData, decoded.KeyData, "Wrong keyData parameter")
-	assert.Equalf(t, config.CertFile, decoded.CertFile, "Wrong certFile parameter")
-	assert.Equalf(t, config.CertData, decoded.CertData, "Wrong certData parameter")
+	assert.Equal(t, config.KeyFile, decoded.KeyFile, "Wrong keyFile parameter")
+	assert.Equal(t, config.KeyData, decoded.KeyData, "Wrong keyData parameter")
+	assert.Equal(t, config.CertFile, decoded.CertFile, "Wrong certFile parameter")
+	assert.Equal(t, config.CertData, decoded.CertData, "Wrong certData parameter")
 }
 
 // TestSaveFilesToDisk tries to create the certificate and private key on the disk from
@@ -187,22 +187,22 @@ func TestSaveFilesToDisk(t *testing.T) {
 	_ = security.SaveCertificate(fmt.Sprintf("%s", []byte(certFixture)), certFile)
 
 	config, err := NewConfig(keyFile, certFile)
-	assert.Tf(t, err == nil, "Expected no error, files are present and valid")
+	assert.True(t, err == nil, "Expected no error, files are present and valid")
 
 	err = config.SaveUserInformations()
-	assert.Tf(t, err != nil, "Expected an error, files are already present")
+	assert.True(t, err != nil, "Expected an error, files are already present")
 	common.DeleteQuietly(keyFile)
 
 	err = config.SaveUserInformations()
-	assert.Tf(t, err != nil, "Expected an error, certificate file is already present")
+	assert.True(t, err != nil, "Expected an error, certificate file is already present")
 
 	common.DeleteQuietly(certFile)
 
 	err = config.SaveUserInformations()
-	assert.Tf(t, err == nil, "No error expected, files are not here")
+	assert.True(t, err == nil, "No error expected, files are not here")
 
-	assert.Tf(t, common.FileExists(keyFile), "Expected private key file")
-	assert.Tf(t, common.FileExists(certFile), "Expected certificate file")
+	assert.True(t, common.FileExists(keyFile), "Expected private key file")
+	assert.True(t, common.FileExists(certFile), "Expected certificate file")
 }
 
 // Helper function to delete all the files
diff --git a/dfssc/user/register_test.go b/dfssc/user/register_test.go
index 4de2259d96b6bbe44924b29ed7794d16b239c0f2..c166854aca7f238feba686f112954fcac7bd8ab7 100644
--- a/dfssc/user/register_test.go
+++ b/dfssc/user/register_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 const caFixture = `-----BEGIN CERTIFICATE-----
@@ -67,23 +67,23 @@ func TestMain(m *testing.M) {
 // Test the validation of the fields
 func TestRegisterValidation(t *testing.T) {
 	_, err := NewRegisterManager(fca, fcert, fkey, addrPort, "password", "FR", "organization", "unit", "dummy", 2048)
-	assert.T(t, err != nil, "Email is invalid")
+	assert.True(t, err != nil, "Email is invalid")
 
 	_, err = NewRegisterManager(fca, fkey, fkey, addrPort, "password", "FR", "organization", "unit", "mpcs@dfss.io", 2048)
-	assert.T(t, err != nil, "Cert file is the same as key file")
+	assert.True(t, err != nil, "Cert file is the same as key file")
 
 	_, err = NewRegisterManager("inexistant.pem", fcert, fkey, addrPort, "password", "FR", "organization", "unit", "mpcs@dfss.io", 2048)
-	assert.T(t, err != nil, "CA file is invalid")
+	assert.True(t, err != nil, "CA file is invalid")
 
 	f, _ := os.Create(fcert)
 	_ = f.Close()
 	_, err = NewRegisterManager(fca, fcert, fkey, addrPort, "password", "FR", "organization", "unit", "mpcs@dfss.io", 2048)
-	assert.T(t, err != nil, "Cert file already exist")
+	assert.True(t, err != nil, "Cert file already exist")
 
 	k, _ := os.Create(fkey)
 	_ = k.Close()
 	_, err = NewRegisterManager(fca, fcert, fkey, addrPort, "password", "FR", "organization", "unit", "mpcs@dfss.io", 2048)
-	assert.T(t, err != nil, "Key file already exist")
+	assert.True(t, err != nil, "Key file already exist")
 
 	_ = os.Remove(fcert)
 	_ = os.Remove(fkey)
@@ -93,9 +93,9 @@ func TestRegisterValidation(t *testing.T) {
 // Only the SUCCESS code should not raise an error
 func TestGetCertificate(t *testing.T) {
 	manager, err := NewRegisterManager(fca, fcert, fkey, addrPort, "password", "FR", "organization", "unit", "dfss@success.io", 2048)
-	assert.T(t, err == nil, "An error occurred while processing")
+	assert.True(t, err == nil, "An error occurred while processing")
 	err = manager.GetCertificate()
-	assert.T(t, err == nil, "An error occurred while getting the certificate")
+	assert.True(t, err == nil, "An error occurred while getting the certificate")
 
 	go testRegisterInvalidResponse(t, "dfss@invarg.io")
 	go testRegisterInvalidResponse(t, "dfss@badauth.io")
@@ -108,9 +108,9 @@ func TestGetCertificate(t *testing.T) {
 func testRegisterInvalidResponse(t *testing.T, mail string) {
 	manager, err := NewRegisterManager(fca, fcert+mail, fkey+mail, addrPort, "password", "FR", "organization", "unit", mail, 2048)
 
-	assert.T(t, err == nil, "An error occurred while processing")
+	assert.True(t, err == nil, "An error occurred while processing")
 	err = manager.GetCertificate()
-	assert.T(t, err != nil, "An error should have occurred while getting the certificate")
+	assert.True(t, err != nil, "An error should have occurred while getting the certificate")
 
 	_ = os.Remove(fcert + mail)
 	_ = os.Remove(fkey + mail)
diff --git a/dfssp/contract/contract_test.go b/dfssp/contract/contract_test.go
index ce4185c6bc2b432285f12d47acb2c8c27a5dcb45..da5ed6495179f6fcb4459246d6f1042494b962d4 100644
--- a/dfssp/contract/contract_test.go
+++ b/dfssp/contract/contract_test.go
@@ -10,7 +10,7 @@ import (
 	"dfss/dfssp/server"
 	"dfss/mgdb"
 	"dfss/net"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/mgo.v2/bson"
 )
 
@@ -159,16 +159,16 @@ func TestCheckAuthorization(t *testing.T) {
 
 	res, err := repository.GetWithSigner(user1.CertHash, id)
 	assert.Equal(t, nil, err)
-	assert.T(t, res != nil)
+	assert.True(t, res != nil)
 	res, err = repository.GetWithSigner(user1.CertHash, bson.NewObjectId())
 	assert.Equal(t, nil, err)
-	assert.T(t, res == nil)
+	assert.True(t, res == nil)
 	res, err = repository.GetWithSigner(user2.CertHash, id)
 	assert.Equal(t, nil, err)
-	assert.T(t, res == nil)
+	assert.True(t, res == nil)
 	res, err = repository.GetWithSigner(user2.CertHash, bson.NewObjectId())
 	assert.Equal(t, nil, err)
-	assert.T(t, res == nil)
+	assert.True(t, res == nil)
 
 	contract := entities.Contract{}
 	_ = repository.Collection.FindByID(entities.Contract{ID: id}, &contract)
@@ -177,6 +177,6 @@ func TestCheckAuthorization(t *testing.T) {
 
 	// Still valid if contract is not ready
 	res, _ = repository.GetWithSigner(user1.CertHash, id)
-	assert.T(t, res != nil)
-	assert.T(t, !res.Ready)
+	assert.True(t, res != nil)
+	assert.True(t, !res.Ready)
 }
diff --git a/dfssp/contract/create_test.go b/dfssp/contract/create_test.go
index d2d2f77841816b208f6c69c020fb1310a6d0c7be..290464862fb4b9542ec19a730ac5c2c86707511a 100644
--- a/dfssp/contract/create_test.go
+++ b/dfssp/contract/create_test.go
@@ -12,7 +12,7 @@ import (
 	"dfss/dfssp/api"
 	"dfss/dfssp/entities"
 	"dfss/net"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 )
 
@@ -105,7 +105,7 @@ func TestAddContract(t *testing.T) {
 	assert.Equal(t, defaultHash[:], contracts[0].File.Hash)
 	assert.Equal(t, "ContractFilename", contracts[0].File.Name)
 	assert.Equal(t, "ContractComment", contracts[0].Comment)
-	assert.T(t, contracts[0].Ready)
+	assert.True(t, contracts[0].Ready)
 
 	assert.Equal(t, 2, len(contracts[0].Signers))
 	assert.Equal(t, user1.ID, contracts[0].Signers[0].UserID)
@@ -140,7 +140,7 @@ func TestAddContractMissingUser(t *testing.T) {
 	assert.Equal(t, defaultHash[:], contracts[0].File.Hash)
 	assert.Equal(t, "ContractFilename", contracts[0].File.Name)
 	assert.Equal(t, "", contracts[0].Comment)
-	assert.T(t, !contracts[0].Ready)
+	assert.True(t, !contracts[0].Ready)
 
 	assert.Equal(t, 2, len(contracts[0].Signers))
 	assert.Equal(t, user1.ID, contracts[0].Signers[0].UserID)
diff --git a/dfssp/contract/fetch_test.go b/dfssp/contract/fetch_test.go
index 5b1bdbebdb30b82afda4be05764a5495894124f3..7fc36a37327b24ec46614ff7fc0a61f8d78f1c9b 100644
--- a/dfssp/contract/fetch_test.go
+++ b/dfssp/contract/fetch_test.go
@@ -7,7 +7,7 @@ import (
 	"dfss/dfssp/api"
 	"dfss/dfssp/contract"
 	"dfss/dfssp/entities"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"gopkg.in/mgo.v2/bson"
 )
@@ -34,7 +34,7 @@ func TestGetContract(t *testing.T) {
 	})
 	assert.Equal(t, nil, err)
 	assert.Equal(t, api.ErrorCode_SUCCESS, c.ErrorCode.Code)
-	assert.T(t, len(c.Json) > 0)
+	assert.True(t, len(c.Json) > 0)
 
 	// Trying to unmarshal contract
 	var entity contract.JSON
diff --git a/dfssp/contract/file_test.go b/dfssp/contract/file_test.go
index 33eb53ea283571b4fa543169229755bfdaa7730f..52948c9cd663549dddde7c4b6f8f4263b4ec9ab6 100644
--- a/dfssp/contract/file_test.go
+++ b/dfssp/contract/file_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"dfss/dfssp/entities"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/mgo.v2/bson"
 )
 
diff --git a/dfssp/contract/join_test.go b/dfssp/contract/join_test.go
index 71733d05ec9abcfca47b63e5619b277a5ebb6eee..f6c2bbfe91d09e3966c305f6942ba5f3d2cb3424 100644
--- a/dfssp/contract/join_test.go
+++ b/dfssp/contract/join_test.go
@@ -5,7 +5,7 @@ import (
 
 	"dfss/dfssp/api"
 	"dfss/dfssp/entities"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"gopkg.in/mgo.v2/bson"
 )
diff --git a/dfssp/contract/ready_test.go b/dfssp/contract/ready_test.go
index 4ff6f155cff41402f3bd38c7aade692b74921103..6356d4a516238475b7075630305adf95db08b6a8 100644
--- a/dfssp/contract/ready_test.go
+++ b/dfssp/contract/ready_test.go
@@ -6,7 +6,7 @@ import (
 	"dfss/dfssp/api"
 	"dfss/dfssp/contract"
 	"dfss/dfssp/entities"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"gopkg.in/mgo.v2/bson"
 )
diff --git a/dfssp/contract/sequence_test.go b/dfssp/contract/sequence_test.go
index e3097c0b36ab62ee5798e9851f0bfc87f64c47ad..acfea374f6b154369a5de421f4afcf1f475deaeb 100644
--- a/dfssp/contract/sequence_test.go
+++ b/dfssp/contract/sequence_test.go
@@ -2,7 +2,7 @@ package contract_test
 
 import (
 	"dfss/dfssp/contract"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/dfssp/templates/manager_test.go b/dfssp/templates/manager_test.go
index 44fbf32e1326fe021e1b149ba9712d4b200bb53c..9319f6e657d0ccfcaf68e411abcad3c089b246ba 100644
--- a/dfssp/templates/manager_test.go
+++ b/dfssp/templates/manager_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"dfss/dfssp/entities"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestInit(t *testing.T) {
diff --git a/dfssp/user/create_test.go b/dfssp/user/create_test.go
index b0089fc20bd33996fa95974162863844098e6b7d..d95054659958863be5c727651d3a729be3862652 100644
--- a/dfssp/user/create_test.go
+++ b/dfssp/user/create_test.go
@@ -3,7 +3,7 @@ package user_test
 import (
 	"dfss/dfssp/api"
 	"dfss/net"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"testing"
 )
diff --git a/dfssp/user/user_test.go b/dfssp/user/user_test.go
index 91ef7555bfbb045823868adcceb416a958985be3..92f5b9ec2aaebdf12cb23213096a134b498a0c86 100644
--- a/dfssp/user/user_test.go
+++ b/dfssp/user/user_test.go
@@ -15,7 +15,7 @@ import (
 	"dfss/dfssp/server"
 	"dfss/mgdb"
 	"dfss/net"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"gopkg.in/mgo.v2/bson"
 	"time"
diff --git a/dfsst/entities/archivesManager_test.go b/dfsst/entities/archivesManager_test.go
index b5e91cd4da6a3fb19a3942ba8f4241582cd9730d..93cc51e5ce2a136abb992b8751f409e5fb2f1856 100644
--- a/dfsst/entities/archivesManager_test.go
+++ b/dfsst/entities/archivesManager_test.go
@@ -8,7 +8,7 @@ import (
 	"crypto/sha512"
 	cAPI "dfss/dfssc/api"
 	"dfss/mgdb"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/mgo.v2/bson"
 )
 
diff --git a/dfsst/entities/check_promise_test.go b/dfsst/entities/check_promise_test.go
index 215d0409ccc4dd507095a0353aeea049de262d75..31047aee42874ae598f43c21e52ac7561745b73e 100644
--- a/dfsst/entities/check_promise_test.go
+++ b/dfsst/entities/check_promise_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	cAPI "dfss/dfssc/api"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestArePromisesValid(t *testing.T) {
diff --git a/dfsst/entities/check_request_test.go b/dfsst/entities/check_request_test.go
index 729fe36df846464161a03b5975b67d560896a047..f0e1716c75261418dde86572dce8270b06294c90 100644
--- a/dfsst/entities/check_request_test.go
+++ b/dfsst/entities/check_request_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	cAPI "dfss/dfssc/api"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIsRequestValid(t *testing.T) {
diff --git a/dfsst/entities/signatureArchives_test.go b/dfsst/entities/signatureArchives_test.go
index a758f82acef36aeb9066b274ac6c3a0079364cae..836a263fbfda86445115b42a96e3b633b587e788 100644
--- a/dfsst/entities/signatureArchives_test.go
+++ b/dfsst/entities/signatureArchives_test.go
@@ -3,7 +3,7 @@ package entities
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestArePromisesEqual(t *testing.T) {
diff --git a/dfsst/resolve/resolve_test.go b/dfsst/resolve/resolve_test.go
index 32a9d8350f2ec90df7bf6c03ee14827c4b0578b8..4ad4d954537d1c8e21f4331d5ba24143f5b59009 100644
--- a/dfsst/resolve/resolve_test.go
+++ b/dfsst/resolve/resolve_test.go
@@ -8,7 +8,7 @@ import (
 	"crypto/sha512"
 	"dfss/dfsst/entities"
 	"dfss/mgdb"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/mgo.v2/bson"
 )
 
diff --git a/tests/impexp_test.go b/tests/impexp_test.go
index 3df50d48bed1c4c528d6e6c05e0198692e24a2bd..872fd609dd47aead56435867d27a82640bccdf44 100644
--- a/tests/impexp_test.go
+++ b/tests/impexp_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 // TestExport tries to export the certificate and pricate key of the client
@@ -49,7 +49,7 @@ func TestExport(t *testing.T) {
 	)
 	err = cmd.Run()
 	assert.Equal(t, nil, err)
-	assert.T(t, common.FileExists(confPath))
+	assert.True(t, common.FileExists(confPath))
 
 	// Bad case 1 : Wrong passphrase for private key
 	badCmd1 := exec.Command(path, "-cert", certPath, "-key", keyPath, "export", confPath)
@@ -59,8 +59,8 @@ func TestExport(t *testing.T) {
 			"wrong passphrase\n",
 	)
 	_ = badCmd1.Run()
-	// assert.Equalf(t, nil, err, "%x", err)
-	assert.T(t, !common.FileExists(confPath))
+	// assert.Equal(t, nil, err, "%x", err)
+	assert.True(t, !common.FileExists(confPath))
 
 	// Bad case 2 : Missing certificate
 	badCmd2 := exec.Command(path, "-cert", certPath, "-key", keyPath, "export", confPath)
@@ -71,7 +71,7 @@ func TestExport(t *testing.T) {
 	)
 	_ = badCmd2.Run()
 	// assert.Equal(t, nil, err)
-	assert.T(t, !common.FileExists(confPath))
+	assert.True(t, !common.FileExists(confPath))
 }
 
 // TestImport tries to import the certificate and private key of a user
@@ -112,7 +112,7 @@ func TestImport(t *testing.T) {
 	)
 	err = cmd.Run()
 	assert.Equal(t, nil, err)
-	assert.T(t, common.FileExists(confPath))
+	assert.True(t, common.FileExists(confPath))
 
 	// Nominal case
 	common.DeleteQuietly(certPath)
@@ -125,8 +125,8 @@ func TestImport(t *testing.T) {
 	)
 	err = cmd.Run()
 	assert.Equal(t, nil, err)
-	assert.T(t, common.FileExists(certPath))
-	assert.T(t, common.FileExists(keyPath))
+	assert.True(t, common.FileExists(certPath))
+	assert.True(t, common.FileExists(keyPath))
 
 	// Bad case 1 : There is already the key file
 	common.DeleteQuietly(certPath)
@@ -137,8 +137,8 @@ func TestImport(t *testing.T) {
 			"password\n",
 	)
 	_ = badCmd1.Run()
-	// assert.Equalf(t, nil, err, "%x", err)
-	assert.T(t, !common.FileExists(certPath))
+	// assert.Equal(t, nil, err, "%x", err)
+	assert.True(t, !common.FileExists(certPath))
 
 	// Bad case 2 : Wrong passphrase of the configuration
 	common.DeleteQuietly(keyPath)
@@ -150,8 +150,8 @@ func TestImport(t *testing.T) {
 	)
 	_ = badCmd2.Run()
 	// assert.Equal(t, nil, err)
-	assert.T(t, !common.FileExists(certPath))
-	assert.T(t, !common.FileExists(keyPath))
+	assert.True(t, !common.FileExists(certPath))
+	assert.True(t, !common.FileExists(keyPath))
 
 	// Bad case 3 : Wrong passphrase for the private key
 	badCmd3 := exec.Command(path, "import", confPath)
@@ -161,6 +161,6 @@ func TestImport(t *testing.T) {
 	)
 	_ = badCmd3.Run()
 	// assert.Equal(t, nil, err)
-	assert.T(t, !common.FileExists(certPath))
-	assert.T(t, !common.FileExists(keyPath))
+	assert.True(t, !common.FileExists(certPath))
+	assert.True(t, !common.FileExists(keyPath))
 }
diff --git a/tests/new_test.go b/tests/new_test.go
index c39a70dfa38833d42158430816d6977a1d6c1dc5..2c8c8682dc31189076dc63ef038a9bfa22bb980b 100644
--- a/tests/new_test.go
+++ b/tests/new_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 // TestNewContract tries to creates new contracts on the platform.
@@ -64,8 +64,8 @@ func TestNewContract(t *testing.T) {
 	assert.Equal(t, 2, len(contract.Signers))
 	assert.Equal(t, "client1@example.com", contract.Signers[0].Email)
 	assert.Equal(t, "client2@example.com", contract.Signers[1].Email)
-	assert.T(t, len(contract.Signers[0].Hash) > 0)
-	assert.T(t, len(contract.Signers[1].Hash) == 0)
+	assert.True(t, len(contract.Signers[0].Hash) > 0)
+	assert.True(t, len(contract.Signers[1].Hash) == 0)
 
 	// Register second signer
 	client2, err := createClient(workingDir, ca, 0)
@@ -76,8 +76,8 @@ func TestNewContract(t *testing.T) {
 	// Check database²
 	contract = getContract("contract.txt", 0)
 	assert.Equal(t, true, contract.Ready)
-	assert.T(t, len(contract.Signers[0].Hash) > 0)
-	assert.T(t, len(contract.Signers[1].Hash) > 0)
+	assert.True(t, len(contract.Signers[0].Hash) > 0)
+	assert.True(t, len(contract.Signers[1].Hash) > 0)
 
 	// Create a second contract
 	client2 = newClient(client2)
@@ -97,8 +97,8 @@ func TestNewContract(t *testing.T) {
 	contract = getContract("contract.txt", 1)
 	assert.Equal(t, true, contract.Ready)
 	assert.Equal(t, "Another comment with some accents héhé", contract.Comment)
-	assert.T(t, len(contract.Signers[0].Hash) > 0)
-	assert.T(t, len(contract.Signers[1].Hash) > 0)
+	assert.True(t, len(contract.Signers[0].Hash) > 0)
+	assert.True(t, len(contract.Signers[1].Hash) > 0)
 
 	// Bad case: wrong password
 	client2 = newClient(client2)
diff --git a/tests/register_test.go b/tests/register_test.go
index 255cf6f9928ffa40693e536bcca299bc2efc58bc..ef7868cb60f71d7784520d6bb774cb8f3dc6eb7e 100644
--- a/tests/register_test.go
+++ b/tests/register_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 // TestRegisterAuth tries to register and auth several users.
diff --git a/tests/sign_test.go b/tests/sign_test.go
index fb6bb5e15f19c4b5a5935c2881d7daeb2f091a43..0e43e8ea2bc7377d4812faf83f19ef93a87ef04d 100644
--- a/tests/sign_test.go
+++ b/tests/sign_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"dfss/dfssp/contract"
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 // TestSignContract unroll the whole signature process.
@@ -105,7 +105,7 @@ func TestSignContract(t *testing.T) {
 		output := <-closeChannel
 		assert.NotEqual(t, nil, output, "The return error should be null")
 		for _, r := range regexes {
-			assert.T(t, r.Match(output), "Regex is not satisfied: ", r.String())
+			assert.True(t, r.Match(output), "Regex is not satisfied: ", r.String())
 		}
 	}
 
@@ -118,10 +118,10 @@ func TestSignContract(t *testing.T) {
 		if proofFile.Match([]byte(file.Name())) {
 			matches++
 			err = os.Remove("./" + file.Name())
-			assert.T(t, err == nil, "Cannot remove .proof matching file")
+			assert.True(t, err == nil, "Cannot remove .proof matching file")
 		}
 	}
-	assert.T(t, matches == 3, "Missing proof file ?")
+	assert.True(t, matches == 3, "Missing proof file ?")
 
 	time.Sleep(time.Second)
 }
diff --git a/tests/starters_test.go b/tests/starters_test.go
index 7337d6ef8603dd4f1c8ec71d63e2767f0dc95806..b219fd8483580f904b107d3445ee5b273786dbd4 100644
--- a/tests/starters_test.go
+++ b/tests/starters_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 const testPort = "9090"