diff --git a/tools/import-trace/Importer.cc b/tools/import-trace/Importer.cc
index b47dc0e5..71c900e8 100644
--- a/tools/import-trace/Importer.cc
+++ b/tools/import-trace/Importer.cc
@@ -30,7 +30,7 @@ bool Importer::create_database() {
 		"	data_address int(10) unsigned NOT NULL,"
 		"	width tinyint(3) unsigned NOT NULL,"
 		"	accesstype enum('R','W') NOT NULL,"
-		"	PRIMARY KEY (variant_id,instr2,data_address)"
+		"	PRIMARY KEY (variant_id,data_address,instr2)"
 		") engine=MyISAM ";
 	return db->query(create_statement.c_str());
 }
diff --git a/tools/prune-trace/Pruner.cc b/tools/prune-trace/Pruner.cc
index 286927f2..1a8ad17e 100644
--- a/tools/prune-trace/Pruner.cc
+++ b/tools/prune-trace/Pruner.cc
@@ -59,7 +59,7 @@ bool Pruner::create_database() {
 	    "  data_address int(10) unsigned NOT NULL,"
 	    "  fspmethod_id int(11) NOT NULL,"
 	    "  PRIMARY KEY (id),"
-	    "  KEY fspmethod_id (fspmethod_id,variant_id,instr2,data_address)"
+	    "  KEY fspmethod_id (fspmethod_id,variant_id,data_address,instr2)"
 	    ") engine=MyISAM ";
 	bool success = (bool) db->query(create_statement.c_str());
 	if (!success) return false;
@@ -70,7 +70,7 @@ bool Pruner::create_database() {
 	    "  data_address    int(10) unsigned NOT NULL,"
 	    "  fspmethod_id    int(11) NOT NULL,"
 	    "  pilot_id        int(11) NOT NULL,"
-	    "  PRIMARY KEY (variant_id, instr2, data_address, fspmethod_id, pilot_id),"
+	    "  PRIMARY KEY (variant_id, data_address, instr2, fspmethod_id, pilot_id),"
 	    "  KEY joinresults (pilot_id,fspmethod_id)) engine=MyISAM";
 
 	return db->query(create_statement.c_str());