diff --git a/src/test/java/bisq/core/dao/node/validation/GenesisTxValidatorTest.java b/src/test/java/bisq/core/dao/node/validation/GenesisTxValidatorTest.java
new file mode 100644
index 00000000..7b1f661b
--- /dev/null
+++ b/src/test/java/bisq/core/dao/node/validation/GenesisTxValidatorTest.java
@@ -0,0 +1,100 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.core.dao.node.validation;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import org.bitcoinj.core.Coin;
+import org.junit.Test;
+import bisq.core.dao.state.blockchain.Tx;
+import bisq.core.dao.state.blockchain.RawTx;
+import bisq.core.dao.state.blockchain.RawTxOutput;
+import bisq.core.dao.state.blockchain.TxInput;
+import bisq.core.dao.state.blockchain.TxOutputType;
+import bisq.core.dao.state.blockchain.TxType;
+import com.google.common.collect.ImmutableList;
+
+public class GenesisTxValidatorTest {
+
+    @Test
+    public void testGetGenesisTx() {
+        int blockHeight = 200;
+        String blockHash = "abc123";
+        Coin genesisTotalSupply = Coin.parseCoin("2.5");
+        long time = new Date().getTime();
+        final List<TxInput> inputs = asList(
+                new TxInput("tx0", 0, null),
+                new TxInput("tx1", 1, null)
+        );
+        final List<RawTxOutput> outputs = asList(new RawTxOutput(0, 101, null, null, null, null, blockHeight));
+        RawTx rawTx = new RawTx(
+            "tx2",
+            blockHeight,
+            blockHash,
+            time,
+            ImmutableList.copyOf(inputs),
+            ImmutableList.copyOf(outputs)
+        );
+
+        String genesisTxId = "genesisTxId";
+        int genesisBlockHeight = 150;
+
+        // With mismatch in blockheight and tx id, we should not get genesis tx back.
+        Optional<Tx> result = GenesisTxValidator.getGenesisTx(genesisTxId, genesisBlockHeight, genesisTotalSupply, rawTx);
+        Optional<Tx> want = Optional.empty();
+        assertEquals(want, result);
+
+        // With correct blockheight but mismatch in tx id, we should still not get genesis tx back.
+        blockHeight = 150;
+        rawTx = new RawTx(
+            "tx2",
+            blockHeight,
+            blockHash,
+            time,
+            ImmutableList.copyOf(inputs),
+            ImmutableList.copyOf(outputs)
+        );
+        result = GenesisTxValidator.getGenesisTx(genesisTxId, genesisBlockHeight, genesisTotalSupply, rawTx);
+        want = Optional.empty();
+        assertEquals(want, result);
+
+        // With correct tx id and blockheight, we should find our genesis tx with correct tx and output type.
+        rawTx = new RawTx(
+            genesisTxId,
+            blockHeight,
+            blockHash,
+            time,
+            ImmutableList.copyOf(inputs),
+            ImmutableList.copyOf(outputs)
+        );
+        result = GenesisTxValidator.getGenesisTx(genesisTxId, genesisBlockHeight, genesisTotalSupply, rawTx);
+        Tx tx = new Tx(rawTx);
+        tx.setTxType(TxType.GENESIS);
+        for (int i = 0; i < tx.getTxOutputs().size(); ++i) {
+            tx.getTxOutputs().get(i).setTxOutputType(TxOutputType.GENESIS_OUTPUT);
+        }
+        want = Optional.of(tx);
+        assertEquals(want, result);
+        // TODO(chirhonul): test that only outputs in tx summing exactly to genesisTotalSupply is accepted, and
+        // that code under test raises RuntimeError otherwise.
+    }
+}