diff --git a/kvdb/backend.go b/kvdb/backend.go
index 269d5d821..3354cc821 100644
--- a/kvdb/backend.go
+++ b/kvdb/backend.go
@@ -274,7 +274,7 @@ func GetTestBackend(path, name string) (Backend, func(), error) {
 			return nil, empty, err
 		}
 		backend, err := Open(
-			EtcdBackendName, context.TODO(), etcdConfig,
+			EtcdBackendName, context.Background(), etcdConfig,
 		)
 		return backend, cancel, err
 
diff --git a/kvdb/etcd/db_test.go b/kvdb/etcd/db_test.go
index 59e29fc94..9ef68d9fe 100644
--- a/kvdb/etcd/db_test.go
+++ b/kvdb/etcd/db_test.go
@@ -19,7 +19,7 @@ func TestDump(t *testing.T) {
 
 	f := NewEtcdTestFixture(t)
 
-	db, err := newEtcdBackend(context.TODO(), f.BackendConfig())
+	db, err := newEtcdBackend(context.Background(), f.BackendConfig())
 	require.NoError(t, err)
 
 	err = db.Update(func(tx walletdb.ReadWriteTx) error {
diff --git a/kvdb/etcd/fixture.go b/kvdb/etcd/fixture.go
index b7a697fad..c19047b39 100644
--- a/kvdb/etcd/fixture.go
+++ b/kvdb/etcd/fixture.go
@@ -76,7 +76,7 @@ func (f *EtcdTestFixture) NewBackend(singleWriter bool) walletdb.DB {
 		cfg.SingleWriter = true
 	}
 
-	db, err := newEtcdBackend(context.TODO(), cfg)
+	db, err := newEtcdBackend(context.Background(), cfg)
 	require.NoError(f.t, err)
 
 	return db
@@ -84,7 +84,9 @@ func (f *EtcdTestFixture) NewBackend(singleWriter bool) walletdb.DB {
 
 // Put puts a string key/value into the test etcd database.
 func (f *EtcdTestFixture) Put(key, value string) {
-	ctx, cancel := context.WithTimeout(context.TODO(), testEtcdTimeout)
+	ctx, cancel := context.WithTimeout(
+		context.Background(), testEtcdTimeout,
+	)
 	defer cancel()
 
 	_, err := f.cli.Put(ctx, key, value)
@@ -95,7 +97,9 @@ func (f *EtcdTestFixture) Put(key, value string) {
 
 // Get queries a key and returns the stored value from the test etcd database.
 func (f *EtcdTestFixture) Get(key string) string {
-	ctx, cancel := context.WithTimeout(context.TODO(), testEtcdTimeout)
+	ctx, cancel := context.WithTimeout(
+		context.Background(), testEtcdTimeout,
+	)
 	defer cancel()
 
 	resp, err := f.cli.Get(ctx, key)
@@ -112,7 +116,9 @@ func (f *EtcdTestFixture) Get(key string) string {
 
 // Dump scans and returns all key/values from the test etcd database.
 func (f *EtcdTestFixture) Dump() map[string]string {
-	ctx, cancel := context.WithTimeout(context.TODO(), testEtcdTimeout)
+	ctx, cancel := context.WithTimeout(
+		context.Background(), testEtcdTimeout,
+	)
 	defer cancel()
 
 	resp, err := f.cli.Get(ctx, "\x00", clientv3.WithFromKey())
diff --git a/kvdb/etcd/readwrite_tx_test.go b/kvdb/etcd/readwrite_tx_test.go
index b5758f7a3..d66b2e251 100644
--- a/kvdb/etcd/readwrite_tx_test.go
+++ b/kvdb/etcd/readwrite_tx_test.go
@@ -16,7 +16,7 @@ func TestChangeDuringManualTx(t *testing.T) {
 
 	f := NewEtcdTestFixture(t)
 
-	db, err := newEtcdBackend(context.TODO(), f.BackendConfig())
+	db, err := newEtcdBackend(context.Background(), f.BackendConfig())
 	require.NoError(t, err)
 
 	tx, err := db.BeginReadWriteTx()
@@ -44,7 +44,7 @@ func TestChangeDuringUpdate(t *testing.T) {
 
 	f := NewEtcdTestFixture(t)
 
-	db, err := newEtcdBackend(context.TODO(), f.BackendConfig())
+	db, err := newEtcdBackend(context.Background(), f.BackendConfig())
 	require.NoError(t, err)
 
 	count := 0
diff --git a/kvdb/etcd/walletdb_interface_test.go b/kvdb/etcd/walletdb_interface_test.go
index 13c57e337..483becbb2 100644
--- a/kvdb/etcd/walletdb_interface_test.go
+++ b/kvdb/etcd/walletdb_interface_test.go
@@ -15,5 +15,5 @@ import (
 func TestWalletDBInterface(t *testing.T) {
 	f := NewEtcdTestFixture(t)
 	cfg := f.BackendConfig()
-	walletdbtest.TestInterface(t, dbType, context.TODO(), &cfg)
+	walletdbtest.TestInterface(t, dbType, context.Background(), &cfg)
 }