diff --git a/src/test/java/org/qortal/test/minting/BlockTimestampTests.java b/src/test/java/org/qortal/test/minting/BlockTimestampTests.java
new file mode 100644
index 00000000..0f91408f
--- /dev/null
+++ b/src/test/java/org/qortal/test/minting/BlockTimestampTests.java
@@ -0,0 +1,63 @@
+package org.qortal.test.minting;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.qortal.block.Block;
+import org.qortal.data.block.BlockData;
+import org.qortal.repository.DataException;
+import org.qortal.repository.Repository;
+import org.qortal.repository.RepositoryManager;
+import org.qortal.test.common.BlockUtils;
+import org.qortal.test.common.Common;
+import org.qortal.transform.Transformer;
+import org.qortal.utils.NTP;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+public class BlockTimestampTests extends Common {
+
+    private static class BlockTimestampDataPoint {
+        public byte[] minterPublicKey;
+        public int minterAccountLevel;
+        public long blockTimestamp;
+    }
+
+    private static final Random RANDOM = new Random();
+
+    @Before
+    public void beforeTest() throws DataException {
+        Common.useSettings("test-settings-v2-block-timestamps.json");
+        NTP.setFixedOffset(0L);
+    }
+
+    @Test
+    public void testTimestamps() throws DataException {
+        try (final Repository repository = RepositoryManager.getRepository()) {
+            Block parentBlock = BlockUtils.mintBlock(repository);
+            BlockData parentBlockData = parentBlock.getBlockData();
+
+            // Generate lots of test minters
+            List<BlockTimestampDataPoint> dataPoints = new ArrayList<>();
+            for (int i = 0; i < 20; i++) {
+                BlockTimestampDataPoint dataPoint = new BlockTimestampDataPoint();
+
+                dataPoint.minterPublicKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
+                RANDOM.nextBytes(dataPoint.minterPublicKey);
+
+                dataPoint.minterAccountLevel = RANDOM.nextInt(5) + 5;
+
+                dataPoint.blockTimestamp = Block.calcTimestamp(parentBlockData, dataPoint.minterPublicKey, dataPoint.minterAccountLevel);
+
+                System.out.printf("[%d] level %d, blockTimestamp %d - parentTimestamp %d = %d%n",
+                        i,
+                        dataPoint.minterAccountLevel,
+                        dataPoint.blockTimestamp,
+                        parentBlockData.getTimestamp(),
+                        dataPoint.blockTimestamp - parentBlockData.getTimestamp()
+                );
+            }
+        }
+    }
+}
diff --git a/src/test/resources/test-chain-v2-block-timestamps.json b/src/test/resources/test-chain-v2-block-timestamps.json
new file mode 100644
index 00000000..072283f0
--- /dev/null
+++ b/src/test/resources/test-chain-v2-block-timestamps.json
@@ -0,0 +1,85 @@
+{
+	"isTestChain": true,
+	"blockTimestampMargin": 500,
+	"transactionExpiryPeriod": 86400000,
+	"maxBlockSize": 2097152,
+	"maxBytesPerUnitFee": 1024,
+	"unitFee": "0.1",
+	"nameRegistrationUnitFees": [
+		{ "timestamp": 1645372800000, "fee": "5" }
+	],
+	"requireGroupForApproval": false,
+	"minAccountLevelToRewardShare": 5,
+	"maxRewardSharesPerMintingAccount": 20,
+	"founderEffectiveMintingLevel": 10,
+	"onlineAccountSignaturesMinLifetime": 3600000,
+	"onlineAccountSignaturesMaxLifetime": 86400000,
+	"rewardsByHeight": [
+		{ "height": 1, "reward": 100 },
+		{ "height": 11, "reward": 10 },
+		{ "height": 21, "reward": 1 }
+	],
+	"sharesByLevel": [
+		{ "levels": [ 1, 2 ], "share": 0.05 },
+		{ "levels": [ 3, 4 ], "share": 0.10 },
+		{ "levels": [ 5, 6 ], "share": 0.15 },
+		{ "levels": [ 7, 8 ], "share": 0.20 },
+		{ "levels": [ 9, 10 ], "share": 0.25 }
+	],
+	"qoraHoldersShare": 0.20,
+	"qoraPerQortReward": 250,
+	"blocksNeededByLevel": [ 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 ],
+	"blockTimingsByHeight": [
+		{ "height": 1, "target": 60000, "deviation": 30000, "power": 0.2 },
+		{ "height": 2, "target": 70000, "deviation": 10000, "power": 0.8 }
+	],
+	"ciyamAtSettings": {
+		"feePerStep": "0.0001",
+		"maxStepsPerRound": 500,
+		"stepsPerFunctionCall": 10,
+		"minutesPerBlock": 1
+	},
+	"featureTriggers": {
+		"messageHeight": 0,
+		"atHeight": 0,
+		"assetsTimestamp": 0,
+		"votingTimestamp": 0,
+		"arbitraryTimestamp": 0,
+		"powfixTimestamp": 0,
+		"qortalTimestamp": 0,
+		"newAssetPricingTimestamp": 0,
+		"groupApprovalTimestamp": 0,
+		"atFindNextTransactionFix": 0,
+		"newBlockSigHeight": 999999,
+		"shareBinFix": 999999,
+		"calcChainWeightTimestamp": 0,
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 9999999999999,
+		"aggregateSignatureTimestamp": 9999999999999
+	},
+	"genesisInfo": {
+		"version": 4,
+		"timestamp": 0,
+		"transactions": [
+			{ "type": "ISSUE_ASSET", "assetName": "QORT", "description": "QORT native coin", "data": "", "quantity": 0, "isDivisible": true, "fee": 0 },
+			{ "type": "ISSUE_ASSET", "assetName": "Legacy-QORA", "description": "Representative legacy QORA", "quantity": 0, "isDivisible": true, "data": "{}", "isUnspendable": true },
+			{ "type": "ISSUE_ASSET", "assetName": "QORT-from-QORA", "description": "QORT gained from holding legacy QORA", "quantity": 0, "isDivisible": true, "data": "{}", "isUnspendable": true },
+
+			{ "type": "GENESIS", "recipient": "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v", "amount": "1000000000" },
+			{ "type": "GENESIS", "recipient": "QixPbJUwsaHsVEofJdozU9zgVqkK6aYhrK", "amount": "1000000" },
+			{ "type": "GENESIS", "recipient": "QaUpHNhT3Ygx6avRiKobuLdusppR5biXjL", "amount": "1000000" },
+			{ "type": "GENESIS", "recipient": "Qci5m9k4rcwe4ruKrZZQKka4FzUUMut3er", "amount": "1000000" },
+
+			{ "type": "CREATE_GROUP", "creatorPublicKey": "2tiMr5LTpaWCgbRvkPK8TFd7k63DyHJMMFFsz9uBf1ZP", "groupName": "dev-group", "description": "developer group", "isOpen": false, "approvalThreshold": "PCT100", "minimumBlockDelay": 0, "maximumBlockDelay": 1440 },
+
+			{ "type": "ISSUE_ASSET", "issuerPublicKey": "2tiMr5LTpaWCgbRvkPK8TFd7k63DyHJMMFFsz9uBf1ZP", "assetName": "TEST", "description": "test asset", "data": "", "quantity": "1000000", "isDivisible": true, "fee": 0 },
+			{ "type": "ISSUE_ASSET", "issuerPublicKey": "C6wuddsBV3HzRrXUtezE7P5MoRXp5m3mEDokRDGZB6ry", "assetName": "OTHER", "description": "other test asset", "data": "", "quantity": "1000000", "isDivisible": true, "fee": 0 },
+			{ "type": "ISSUE_ASSET", "issuerPublicKey": "2tiMr5LTpaWCgbRvkPK8TFd7k63DyHJMMFFsz9uBf1ZP", "assetName": "GOLD", "description": "gold test asset", "data": "", "quantity": "1000000", "isDivisible": true, "fee": 0 },
+
+			{ "type": "ACCOUNT_FLAGS", "target": "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v", "andMask": -1, "orMask": 1, "xorMask": 0 },
+			{ "type": "REWARD_SHARE", "minterPublicKey": "2tiMr5LTpaWCgbRvkPK8TFd7k63DyHJMMFFsz9uBf1ZP", "recipient": "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v", "rewardSharePublicKey": "7PpfnvLSG7y4HPh8hE7KoqAjLCkv7Ui6xw4mKAkbZtox", "sharePercent": "100" },
+
+			{ "type": "ACCOUNT_LEVEL", "target": "Qci5m9k4rcwe4ruKrZZQKka4FzUUMut3er", "level": 5 }
+		]
+	}
+}
diff --git a/src/test/resources/test-chain-v2.json b/src/test/resources/test-chain-v2.json
index f308712d..c1677da8 100644
--- a/src/test/resources/test-chain-v2.json
+++ b/src/test/resources/test-chain-v2.json
@@ -53,7 +53,8 @@
 		"shareBinFix": 999999,
 		"calcChainWeightTimestamp": 0,
 		"transactionV5Timestamp": 0,
-		"transactionV6Timestamp": 0
+		"transactionV6Timestamp": 0,
+		"aggregateSignatureTimestamp": 2652560000000
 	},
 	"genesisInfo": {
 		"version": 4,
diff --git a/src/test/resources/test-settings-v2-block-timestamps.json b/src/test/resources/test-settings-v2-block-timestamps.json
new file mode 100644
index 00000000..dbbbebbe
--- /dev/null
+++ b/src/test/resources/test-settings-v2-block-timestamps.json
@@ -0,0 +1,19 @@
+{
+  "repositoryPath": "testdb",
+  "bitcoinNet": "TEST3",
+  "litecoinNet": "TEST3",
+  "restrictedApi": false,
+  "blockchainConfig": "src/test/resources/test-chain-v2-block-timestamps.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
+  "wipeUnconfirmedOnStart": false,
+  "testNtpOffset": 0,
+  "minPeers": 0,
+  "pruneBlockLimit": 100,
+  "bootstrapFilenamePrefix": "test-",
+  "dataPath": "data-test",
+  "tempDataPath": "data-test/_temp",
+  "listsPath": "lists-test",
+  "storagePolicy": "FOLLOWED_OR_VIEWED",
+  "maxStorageCapacity": 104857600
+}