diff --git a/TODO b/TODO
new file mode 100644
index 0000000000..08b816b2c1
--- /dev/null
+++ b/TODO
@@ -0,0 +1,21 @@
+- Move over to standard & clear JSON format:
+
+All files should be of the form:
+
+{
+	"test1name":
+	{
+		"test1property1": ...,
+		"test1property2": ...,
+		...
+	},
+	"test2name":
+	{
+		"test2property1": ...,
+		"test2property2": ...,
+		...
+	}
+}
+
+Arrays are allowed, but don't use them for sets of properties - only use them for data that is clearly a continuous contiguous sequence of values.
+
diff --git a/hexencodetest.txt b/hexencodetest.json
similarity index 100%
rename from hexencodetest.txt
rename to hexencodetest.json
diff --git a/rlptest.txt b/rlptest.json
similarity index 100%
rename from rlptest.txt
rename to rlptest.json
diff --git a/trietest.txt b/trietest.json
similarity index 100%
rename from trietest.txt
rename to trietest.json
diff --git a/vmtests.json b/vmtests.json
new file mode 100644
index 0000000000..07f69a6716
--- /dev/null
+++ b/vmtests.json
@@ -0,0 +1,56 @@
+{
+	"suicide": {
+	    "env" : {
+		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
+		"currentDifficulty" : "256",
+		"currentTimestamp" : 1,
+		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+		"feeMultiplier" : 1
+	    },
+	    "pre" : {
+		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+		    "balance" : 1000000000000000000,
+		    "nonce" : 0,
+		    "code" : "(suicide (txsender))"
+		}
+	    },
+	    "exec" : [
+		{
+		    "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+		    "sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+		    "value" : 1000000000000000000,
+		    "data" : [
+		    ]
+		}
+	    ]
+	},
+
+	"mktx": {
+	    "env" : {
+		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
+		"currentDifficulty" : "256",
+		"currentTimestamp" : 1,
+		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+		"feeMultiplier" : 1
+	    },
+	    "pre" : {
+		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+		    "balance" : 1000000000000000000,
+		    "nonce" : 0,
+		    "code" : "(mktx (txsender) (txvalue) 0)"
+		}
+	    },
+	    "exec" : [
+		{
+		    "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+		    "sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+		    "value" : 1000000000000000000,
+		    "data" : [
+		    ]
+		}
+	    ]
+	}
+
+}