diff --git a/db/migrations/1513805096_tx_to_index.down.sql b/db/migrations/1513805096_tx_to_index.down.sql
new file mode 100644
index 00000000..cd501119
--- /dev/null
+++ b/db/migrations/1513805096_tx_to_index.down.sql
@@ -0,0 +1 @@
+DROP INDEX tx_to_index;
\ No newline at end of file
diff --git a/db/migrations/1513805096_tx_to_index.up.sql b/db/migrations/1513805096_tx_to_index.up.sql
new file mode 100644
index 00000000..d51eb6f2
--- /dev/null
+++ b/db/migrations/1513805096_tx_to_index.up.sql
@@ -0,0 +1 @@
+CREATE INDEX tx_to_index ON transactions(tx_to);
\ No newline at end of file
diff --git a/db/migrations/1513805100_tx_from_index.down.sql b/db/migrations/1513805100_tx_from_index.down.sql
new file mode 100644
index 00000000..5e0d00a0
--- /dev/null
+++ b/db/migrations/1513805100_tx_from_index.down.sql
@@ -0,0 +1 @@
+DROP INDEX tx_from_index;
\ No newline at end of file
diff --git a/db/migrations/1513805100_tx_from_index.up.sql b/db/migrations/1513805100_tx_from_index.up.sql
new file mode 100644
index 00000000..d56c117d
--- /dev/null
+++ b/db/migrations/1513805100_tx_from_index.up.sql
@@ -0,0 +1 @@
+CREATE INDEX tx_from_index ON transactions(tx_from);
\ No newline at end of file
diff --git a/db/schema.sql b/db/schema.sql
index 76a6fddf..76ac4374 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -353,6 +353,20 @@ CREATE INDEX block_number_index ON blocks USING btree (block_number);
 CREATE INDEX node_id_index ON blocks USING btree (node_id);
 
 
+--
+-- Name: tx_from_index; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX tx_from_index ON transactions USING btree (tx_from);
+
+
+--
+-- Name: tx_to_index; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX tx_to_index ON transactions USING btree (tx_to);
+
+
 --
 -- Name: transactions blocks_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
diff --git a/pkg/repositories/testing/helpers.go b/pkg/repositories/testing/helpers.go
index c388105a..70a71d18 100644
--- a/pkg/repositories/testing/helpers.go
+++ b/pkg/repositories/testing/helpers.go
@@ -334,6 +334,9 @@ func AssertRepositoryBehavior(buildRepository func(node core.Node) repositories.
 			repository.CreateContract(core.Contract{Hash: "x123"})
 			contract, err := repository.FindContract("x123")
 			Expect(err).ToNot(HaveOccurred())
+			sort.Slice(contract.Transactions, func(i, j int) bool {
+				return contract.Transactions[i].Hash < contract.Transactions[j].Hash
+			})
 			Expect(contract.Transactions).To(
 				Equal([]core.Transaction{
 					{Hash: "TRANSACTION1", To: "x123"},