diff --git a/state/execution_test.go b/state/execution_test.go
index 324ad3eee..b1c6c1752 100644
--- a/state/execution_test.go
+++ b/state/execution_test.go
@@ -175,16 +175,19 @@ func TestFinalizeBlockValidators(t *testing.T) {
 
 	var (
 		now        = tmtime.Now()
-		commitSig0 = types.NewCommitSigForBlock(
-			[]byte("Signature1"),
-			state.Validators.Validators[0].Address,
-			now,
-		)
-		commitSig1 = types.NewCommitSigForBlock(
-			[]byte("Signature2"),
-			state.Validators.Validators[1].Address,
-			now,
-		)
+		commitSig0 = types.CommitSig{
+			BlockIDFlag:      types.BlockIDFlagCommit,
+			ValidatorAddress: state.Validators.Validators[0].Address,
+			Timestamp:        now,
+			Signature:        []byte("Signature1"),
+		}
+
+		commitSig1 = types.CommitSig{
+			BlockIDFlag:      types.BlockIDFlagCommit,
+			ValidatorAddress: state.Validators.Validators[1].Address,
+			Timestamp:        now,
+			Signature:        []byte("Signature2"),
+		}
 		absentSig = types.NewCommitSigAbsent()
 	)
 
diff --git a/store/store_test.go b/store/store_test.go
index c1114907d..15d853338 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -377,8 +377,7 @@ func TestLoadBaseMeta(t *testing.T) {
 }
 
 func TestLoadBlockPart(t *testing.T) {
-	cfg, err := config.ResetTestRoot(t.TempDir(), "blockchain_reactor_test")
-	require.NoError(t, err)
+	cfg := config.ResetTestRoot("blockchain_reactor_test")
 
 	bs, db := newInMemoryBlockStore()
 	const height, index = 10, 1