diff --git a/libs/gamecode/test/Makemodule.am b/libs/gamecode/test/Makemodule.am
index af16fe67f..dc5e6dabd 100644
--- a/libs/gamecode/test/Makemodule.am
+++ b/libs/gamecode/test/Makemodule.am
@@ -1,4 +1,5 @@
 libs_gamecode_tests = \
+	libs/gamecode/test/test-conv0 \
 	libs/gamecode/test/test-double \
 	libs/gamecode/test/test-float \
 	libs/gamecode/test/test-int \
@@ -19,6 +20,11 @@ test_gamecode_libs= \
 	libs/gamecode/libQFgamecode.la \
 	libs/util/libQFutil.la
 
+libs_gamecode_test_test_conv0_SOURCES= \
+	libs/gamecode/test/test-conv0.c
+libs_gamecode_test_test_conv0_LDADD=		$(test_gamecode_libs)
+libs_gamecode_test_test_conv0_DEPENDENCIES=	$(test_gamecode_libs)
+
 libs_gamecode_test_test_double_SOURCES= \
 	libs/gamecode/test/test-double.c
 libs_gamecode_test_test_double_LDADD=		$(test_gamecode_libs)
diff --git a/libs/gamecode/test/test-conv0.c b/libs/gamecode/test/test-conv0.c
new file mode 100644
index 000000000..e6d6b6ad7
--- /dev/null
+++ b/libs/gamecode/test/test-conv0.c
@@ -0,0 +1,176 @@
+#include "head.c"
+
+#include "QF/mathlib.h"
+
+static pr_ivec4_t int_conv_init[] = {
+	{          5,         -5, 0x80000000, 0x7fffffff},	//int
+	{ 0x3fc00000, 0xbfc00000, 0x7149f2ca, 0xf149f2ca},	//float 1e30, -1e30
+	{         99, 0x80000000, 0x80000000,         99},	//long
+	{        256,          0, 0x7fffffff,          0},	//long
+	{ 0x39a08cea, 0x46293e59, 0x39a08cea, 0xc6293e59},	//double 1e30, -1e30
+	{          0, 0x3ff80000,          0, 0xbff80000},	//double 1.5, -1.5
+	{          5,         -5, 0x80000000, 0x7fffffff},	//uint
+	{         ~0,          1, 0x80000000,          0},	//bool32
+	{         99, 0x80000000, 0x80000000,         99},	//ulong
+	{        256,          0, 0x7fffffff,          0},	//ulong
+	{         ~0,         ~0,         ~0,          0},	//bool64
+	{          0,         ~0,          0,          0},	//bool64
+	{  0,  0, 0, 0},
+	{  0,  0, 0, 0},
+	{  0,  0, 0, 0},
+	{  0,  0, 0, 0},
+	{  0,  0, 0, 0},
+	{  0,  0, 0, 0},
+	{  0,  0, 0, 0},
+	{  0,  0, 0, 0},
+};
+
+static pr_ivec4_t int_conv_expect[] = {
+	{          5,         -5, 0x80000000, 0x7fffffff},	//int
+	{ 0x3fc00000, 0xbfc00000, 0x7149f2ca, 0xf149f2ca},	//float
+	{         99, 0x80000000, 0x80000000,         99},	//long
+	{        256,          0, 0x7fffffff,          0},	//long
+	{ 0x39a08cea, 0x46293e59, 0x39a08cea, 0xc6293e59},	//double 1e30, -1e30
+	{          0, 0x3ff80000,          0, 0xbff80000},	//double 1.5, -1.5
+	{          5,         -5, 0x80000000, 0x7fffffff},	//uint
+	{         ~0,          1, 0x80000000,          0},	//bool32
+	{         99, 0x80000000, 0x80000000,         99},	//ulong
+	{        256,          0, 0x7fffffff,          0},	//ulong
+	{         ~0,         ~0,         ~0,          0},	//bool64
+	{          0,         ~0,          0,          0},	//bool64
+	{          0,          0,          0,          0},	// int
+	{          1,         -1, 0x80000000, 0x80000000},	// float
+	{         99, 0x80000000,        256, 0x7fffffff},	// long
+	{ 0x80000000, 0x80000000,          1,         -1},	// double
+	{          0,          0,          0,          0},	// uint
+	{          1,          1,          1,          0},	// bool32
+	{         99, 0x80000000,        256, 0x7fffffff},	// ulong
+	{          1,          1,          1,          0},	// bool64
+};
+
+static dstatement_t int_conv_1_statements[] = {
+	{ OP(0, 0, 0, OP_LEA_A), 4, 0, 80 },	// init index
+	{ OP(0, 0, 0, OP_LEA_A), 8, 0, 81 },	// init index for 64-bits
+//loop:
+	{ OP(0, 0, 0, OP_LEA_C), 80, -1, 80 },	// dec index
+	{ OP(0, 0, 0, OP_LEA_C), 81, -2, 81 },	// dec index for 64-bits
+	{ OP(0, 0, 0, OP_IFAE_A), 2, 0, 80 },
+	{ OP(0, 0, 0, OP_BREAK), 0, 0, 0 },
+	{ OP(0, 0, 0, OP_WITH), 4, 80, 1 },
+	{ OP(0, 0, 0, OP_WITH), 4, 81, 2 },
+	{ OP(1, 1, 1, OP_CONV),  4, 0010, 52 },
+	{ OP(2, 1, 1, OP_CONV),  8, 0020, 56 },
+	{ OP(2, 1, 1, OP_CONV), 16, 0030, 60 },
+	{ OP(1, 1, 1, OP_CONV), 28, 0050, 68 },
+	{ OP(2, 1, 1, OP_CONV), 32, 0060, 72 },
+	{ OP(2, 1, 1, OP_CONV), 40, 0070, 76 },
+	{ OP(1, 1, 1, OP_JUMP_A), -12, 0, 0 },
+};
+
+static dstatement_t int_conv_2_statements[] = {
+	{ OP(0, 0, 0, OP_LEA_A), 4, 0, 80 },	// index
+	{ OP(0, 0, 0, OP_LEA_A), 8, 0, 81 },	// init index for 64-bits
+//loop:
+	{ OP(0, 0, 0, OP_LEA_C), 80, -2, 80 },	// dec index
+	{ OP(0, 0, 0, OP_LEA_C), 81, -4, 81 },	// dec index for 64-bits
+	{ OP(0, 0, 0, OP_IFAE_A), 2, 0, 80 },
+	{ OP(0, 0, 0, OP_BREAK), 0, 0, 0 },
+	{ OP(0, 0, 0, OP_WITH), 4, 80, 1 },
+	{ OP(0, 0, 0, OP_WITH), 4, 81, 2 },
+	{ OP(1, 1, 1, OP_CONV),  4, 0110, 52 },
+	{ OP(2, 1, 1, OP_CONV),  8, 0120, 56 },
+	{ OP(2, 1, 1, OP_CONV), 16, 0130, 60 },
+	{ OP(1, 1, 1, OP_CONV), 28, 0150, 68 },
+	{ OP(2, 1, 1, OP_CONV), 32, 0160, 72 },
+	{ OP(2, 1, 1, OP_CONV), 40, 0170, 76 },
+	{ OP(1, 1, 1, OP_JUMP_A), -12, 0, 0 },
+};
+
+static dstatement_t int_conv_3a_statements[] = {
+	{ OP(1, 1, 1, OP_CONV),  4, 0210, 52 },
+	{ OP(1, 1, 1, OP_CONV),  7, 0010, 55 },
+	{ OP(2, 1, 1, OP_CONV),  8, 0220, 56 },
+	{ OP(2, 1, 1, OP_CONV), 14, 0020, 59 },
+	{ OP(2, 1, 1, OP_CONV), 16, 0230, 60 },
+	{ OP(2, 1, 1, OP_CONV), 22, 0030, 63 },
+	{ OP(1, 1, 1, OP_CONV), 28, 0250, 68 },
+	{ OP(1, 1, 1, OP_CONV), 31, 0050, 71 },
+	{ OP(2, 1, 1, OP_CONV), 32, 0260, 72 },
+	{ OP(2, 1, 1, OP_CONV), 38, 0060, 75 },
+	{ OP(2, 1, 1, OP_CONV), 40, 0270, 76 },
+	{ OP(2, 1, 1, OP_CONV), 46, 0070, 79 },
+};
+
+static dstatement_t int_conv_3b_statements[] = {
+	{ OP(1, 1, 1, OP_CONV),  4, 0010, 52 },
+	{ OP(1, 1, 1, OP_CONV),  5, 0210, 53 },
+	{ OP(2, 1, 1, OP_CONV),  8, 0020, 56 },
+	{ OP(2, 1, 1, OP_CONV), 10, 0220, 57 },
+	{ OP(2, 1, 1, OP_CONV), 16, 0030, 60 },
+	{ OP(2, 1, 1, OP_CONV), 18, 0230, 61 },
+	{ OP(1, 1, 1, OP_CONV), 28, 0050, 68 },
+	{ OP(1, 1, 1, OP_CONV), 29, 0250, 69 },
+	{ OP(2, 1, 1, OP_CONV), 32, 0060, 72 },
+	{ OP(2, 1, 1, OP_CONV), 34, 0260, 73 },
+	{ OP(2, 1, 1, OP_CONV), 40, 0070, 76 },
+	{ OP(2, 1, 1, OP_CONV), 42, 0270, 77 },
+};
+
+static dstatement_t int_conv_4_statements[] = {
+	{ OP(1, 1, 1, OP_CONV),  4, 0310, 52 },
+	{ OP(2, 1, 1, OP_CONV),  8, 0320, 56 },
+	{ OP(2, 1, 1, OP_CONV), 16, 0330, 60 },
+	{ OP(1, 1, 1, OP_CONV), 28, 0350, 68 },
+	{ OP(2, 1, 1, OP_CONV), 32, 0360, 72 },
+	{ OP(2, 1, 1, OP_CONV), 40, 0370, 76 },
+};
+
+test_t tests[] = {
+	{
+		.desc = "int conv 1",
+		.extra_globals = 4 * 1,
+		.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
+		.num_statements = num_statements (int_conv_1_statements),
+		.statements = int_conv_1_statements,
+		.init_globals = (pr_int_t *) int_conv_init,
+		.expect_globals = (pr_int_t *) int_conv_expect,
+	},
+	{
+		.desc = "int conv 2",
+		.extra_globals = 4 * 1,
+		.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
+		.num_statements = num_statements (int_conv_2_statements),
+		.statements = int_conv_2_statements,
+		.init_globals = (pr_int_t *) int_conv_init,
+		.expect_globals = (pr_int_t *) int_conv_expect,
+	},
+	{
+		.desc = "int conv 3a",
+		.extra_globals = 4 * 1,
+		.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
+		.num_statements = num_statements (int_conv_3a_statements),
+		.statements = int_conv_3a_statements,
+		.init_globals = (pr_int_t *) int_conv_init,
+		.expect_globals = (pr_int_t *) int_conv_expect,
+	},
+	{
+		.desc = "int conv 3b",
+		.extra_globals = 4 * 1,
+		.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
+		.num_statements = num_statements (int_conv_3b_statements),
+		.statements = int_conv_3b_statements,
+		.init_globals = (pr_int_t *) int_conv_init,
+		.expect_globals = (pr_int_t *) int_conv_expect,
+	},
+	{
+		.desc = "int conv 4",
+		.extra_globals = 4 * 1,
+		.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
+		.num_statements = num_statements (int_conv_4_statements),
+		.statements = int_conv_4_statements,
+		.init_globals = (pr_int_t *) int_conv_init,
+		.expect_globals = (pr_int_t *) int_conv_expect,
+	},
+};
+
+#include "main.c"