diff --git a/x86/access.c b/x86/access.c
index 068b4dc..ac879c3 100644
--- a/x86/access.c
+++ b/x86/access.c
@@ -1025,8 +1025,6 @@ int main(void)
 {
     int r;
 
-    setup_idt();
-
     printf("starting test\n\n");
     page_table_levels = 4;
     r = ac_test_run();
diff --git a/x86/apic.c b/x86/apic.c
index 2aacad6..a7681fe 100644
--- a/x86/apic.c
+++ b/x86/apic.c
@@ -648,7 +648,6 @@ static void test_pv_ipi(void)
 int main(void)
 {
     setup_vm();
-    smp_init();
 
     test_lapic_existence();
 
diff --git a/x86/asyncpf.c b/x86/asyncpf.c
index 80bbe45..305a923 100644
--- a/x86/asyncpf.c
+++ b/x86/asyncpf.c
@@ -90,7 +90,6 @@ int main(int ac, char **av)
 	int loop = 2;
 
 	setup_vm();
-	setup_idt();
 	printf("install handler\n");
 	handle_exception(14, pf_isr);
 	apf_reason = 0;
diff --git a/x86/cmpxchg8b.c b/x86/cmpxchg8b.c
index bbba2f9..a416f44 100644
--- a/x86/cmpxchg8b.c
+++ b/x86/cmpxchg8b.c
@@ -20,7 +20,6 @@ static void test_cmpxchg8b(u32 *mem)
 int main(void)
 {
 	setup_vm();
-	setup_idt();
 
 	test_cmpxchg8b(phys_to_virt(read_cr3()) + 4088);
 	return report_summary();
diff --git a/x86/cstart.S b/x86/cstart.S
index 8462da3..38ac19b 100644
--- a/x86/cstart.S
+++ b/x86/cstart.S
@@ -161,8 +161,9 @@ start32:
 	call load_tss
 	call mask_pic_interrupts
 	call enable_apic
-	call smp_init
+	call ap_init
 	call enable_x2apic
+	call smp_init
         push $__environ
         push $__argv
         push __argc
@@ -191,7 +192,7 @@ load_tss:
 	ltr %ax
 	ret
 
-smp_init:
+ap_init:
 	cld
 	lea sipi_entry, %esi
 	xor %edi, %edi
@@ -204,7 +205,6 @@ smp_init:
 1:	pause
 	cmpw %ax, cpu_online_count
 	jne 1b
-smp_init_done:
 	ret
 
 online_cpus:
diff --git a/x86/cstart64.S b/x86/cstart64.S
index cffbb07..1ecfbdb 100644
--- a/x86/cstart64.S
+++ b/x86/cstart64.S
@@ -257,8 +257,9 @@ start64:
 	mov %rax, __args(%rip)
 	call __setup_args
 
-	call smp_init
+	call ap_init
 	call enable_x2apic
+	call smp_init
 
 	mov __argc(%rip), %edi
 	lea __argv(%rip), %rsi
@@ -308,7 +309,7 @@ load_tss:
 	ltr %ax
 	ret
 
-smp_init:
+ap_init:
 	cld
 	lea sipi_entry, %rsi
 	xor %rdi, %rdi
@@ -321,7 +322,6 @@ smp_init:
 1:	pause
 	cmpw %ax, cpu_online_count
 	jne 1b
-smp_init_done:
 	ret
 
 cpu_online_count:	.word 1
diff --git a/x86/debug.c b/x86/debug.c
index 972762a..9798e62 100644
--- a/x86/debug.c
+++ b/x86/debug.c
@@ -76,7 +76,6 @@ int main(int ac, char **av)
 {
 	unsigned long start;
 
-	setup_idt();
 	handle_exception(DB_VECTOR, handle_db);
 	handle_exception(BP_VECTOR, handle_bp);
 
diff --git a/x86/emulator.c b/x86/emulator.c
index 2990550..98743d1 100644
--- a/x86/emulator.c
+++ b/x86/emulator.c
@@ -1027,7 +1027,6 @@ int main(void)
 	unsigned long t1, t2;
 
 	setup_vm();
-	setup_idt();
 	handle_exception(UD_VECTOR, record_no_fep);
 	asm(KVM_FEP "nop");
 	handle_exception(UD_VECTOR, 0);
diff --git a/x86/eventinj.c b/x86/eventinj.c
index aa7c233..46593c9 100644
--- a/x86/eventinj.c
+++ b/x86/eventinj.c
@@ -212,7 +212,6 @@ int main(void)
 	ulong *pt, *cr3, i;
 
 	setup_vm();
-	setup_idt();
 	setup_alt_stack();
 
 	handle_irq(32, tirq0);
diff --git a/x86/hypercall.c b/x86/hypercall.c
index 7fbbf30..28760e3 100644
--- a/x86/hypercall.c
+++ b/x86/hypercall.c
@@ -58,7 +58,6 @@ int main(int ac, char **av)
 
 #ifdef __x86_64__
 	setup_vm();
-	setup_idt();
 	setup_alt_stack();
 	set_intr_alt_stack(13, gp_tss);
 
diff --git a/x86/hyperv_clock.c b/x86/hyperv_clock.c
index 99775a9..b4cfc9f 100644
--- a/x86/hyperv_clock.c
+++ b/x86/hyperv_clock.c
@@ -151,7 +151,6 @@ int main(int ac, char **av)
 	uint64_t ref1, ref2;
 
 	setup_vm();
-	smp_init();
 
 	ncpus = cpu_count();
 	if (ncpus > MAX_CPU)
diff --git a/x86/hyperv_connections.c b/x86/hyperv_connections.c
index 55cc033..6e8ac32 100644
--- a/x86/hyperv_connections.c
+++ b/x86/hyperv_connections.c
@@ -272,7 +272,6 @@ int main(int ac, char **av)
 	}
 
 	setup_vm();
-	smp_init();
 	ncpus = cpu_count();
 	if (ncpus > MAX_CPUS)
 		report_abort("# cpus: %d > %d", ncpus, MAX_CPUS);
diff --git a/x86/hyperv_stimer.c b/x86/hyperv_stimer.c
index ddfc844..75a69a1 100644
--- a/x86/hyperv_stimer.c
+++ b/x86/hyperv_stimer.c
@@ -336,7 +336,6 @@ static void stimer_test_all(void)
     int ncpus;
 
     setup_vm();
-    smp_init();
     enable_apic();
 
     ncpus = cpu_count();
diff --git a/x86/hyperv_synic.c b/x86/hyperv_synic.c
index b6c7104..25121ca 100644
--- a/x86/hyperv_synic.c
+++ b/x86/hyperv_synic.c
@@ -147,7 +147,6 @@ int main(int ac, char **av)
         bool ok;
 
         setup_vm();
-        smp_init();
         enable_apic();
 
         ncpus = cpu_count();
diff --git a/x86/idt_test.c b/x86/idt_test.c
index 964f119..5d0fc79 100644
--- a/x86/idt_test.c
+++ b/x86/idt_test.c
@@ -30,7 +30,6 @@ int main(void)
     bool rflags_rf;
 
     printf("Starting IDT test\n");
-    setup_idt();
     r = test_gp(&rflags_rf);
     report(r == GP_VECTOR, "Testing #GP");
     report(rflags_rf, "Testing #GP rflags.rf");
diff --git a/x86/intel-iommu.c b/x86/intel-iommu.c
index 25feec0..4442fe1 100644
--- a/x86/intel-iommu.c
+++ b/x86/intel-iommu.c
@@ -133,7 +133,6 @@ static void vtd_test_ir(void)
 int main(int argc, char *argv[])
 {
 	setup_vm();
-	smp_init();
 
 	vtd_init();
 
diff --git a/x86/ioapic.c b/x86/ioapic.c
index f315e4b..b9f6dd2 100644
--- a/x86/ioapic.c
+++ b/x86/ioapic.c
@@ -471,7 +471,6 @@ static void update_cr3(void *cr3)
 int main(void)
 {
 	setup_vm();
-	smp_init();
 
 	on_cpus(update_cr3, (void *)read_cr3());
 	mask_pic_interrupts();
diff --git a/x86/kvmclock_test.c b/x86/kvmclock_test.c
index 48a7cdb..de4b5e1 100644
--- a/x86/kvmclock_test.c
+++ b/x86/kvmclock_test.c
@@ -115,8 +115,6 @@ int main(int ac, char **av)
         if (ac > 3)
                 threshold = atol(av[3]);
 
-        smp_init();
-
         ncpus = cpu_count();
         if (ncpus > MAX_CPU)
                 report_abort("number cpus exceeds %d", MAX_CPU);
diff --git a/x86/memory.c b/x86/memory.c
index 22c50c9..8f61020 100644
--- a/x86/memory.c
+++ b/x86/memory.c
@@ -27,7 +27,6 @@ int main(int ac, char **av)
 {
 	int expected;
 
-	setup_idt();
 	handle_exception(UD_VECTOR, handle_ud);
 
 	/* 3-byte instructions: */
diff --git a/x86/pcid.c b/x86/pcid.c
index ad9d30c..a8dc8cb 100644
--- a/x86/pcid.c
+++ b/x86/pcid.c
@@ -130,8 +130,6 @@ int main(int ac, char **av)
 {
     int pcid_enabled = 0, invpcid_enabled = 0;
 
-    setup_idt();
-
     if (this_cpu_has(X86_FEATURE_PCID))
         pcid_enabled = 1;
     if (this_cpu_has(X86_FEATURE_INVPCID))
diff --git a/x86/pmu.c b/x86/pmu.c
index acba20e..57a2b23 100644
--- a/x86/pmu.c
+++ b/x86/pmu.c
@@ -533,7 +533,6 @@ int main(int ac, char **av)
 	struct cpuid id = cpuid(10);
 
 	setup_vm();
-	setup_idt();
 	handle_irq(PC_VECTOR, cnt_overflow);
 	buf = malloc(N*64);
 
diff --git a/x86/rdpru.c b/x86/rdpru.c
index 127ba1c..5cb69cb 100644
--- a/x86/rdpru.c
+++ b/x86/rdpru.c
@@ -14,8 +14,6 @@ static int rdpru_checking(void)
 
 int main(int ac, char **av)
 {
-	setup_idt();
-
 	if (this_cpu_has(X86_FEATURE_RDPRU))
 		report_skip("RDPRU raises #UD");
 	else
diff --git a/x86/smptest.c b/x86/smptest.c
index 1b0ae3e..2989aa0 100644
--- a/x86/smptest.c
+++ b/x86/smptest.c
@@ -19,8 +19,6 @@ int main(void)
     int ncpus;
     int i;
 
-    smp_init();
-
     ncpus = cpu_count();
     printf("found %d cpus\n", ncpus);
     for (i = 0; i < ncpus; ++i)
diff --git a/x86/svm.c b/x86/svm.c
index 41685bf..f35c063 100644
--- a/x86/svm.c
+++ b/x86/svm.c
@@ -375,7 +375,6 @@ int main(int ac, char **av)
 	av++;
 
 	setup_vm();
-	smp_init();
 
 	if (!this_cpu_has(X86_FEATURE_SVM)) {
 		printf("SVM not availble\n");
diff --git a/x86/syscall.c b/x86/syscall.c
index b7e29d6..8cef860 100644
--- a/x86/syscall.c
+++ b/x86/syscall.c
@@ -100,7 +100,6 @@ static void test_syscall_tf(void)
 
 int main(int ac, char **av)
 {
-    setup_idt();
     test_syscall_lazy_load();
     test_syscall_tf();
 
diff --git a/x86/taskswitch2.c b/x86/taskswitch2.c
index 4dc6337..ed3f99a 100644
--- a/x86/taskswitch2.c
+++ b/x86/taskswitch2.c
@@ -283,7 +283,6 @@ static void test_conforming_switch(void)
 int main(void)
 {
 	setup_vm();
-	setup_idt();
 	setup_tss32();
 
 	test_gdt_task_gate();
diff --git a/x86/tscdeadline_latency.c b/x86/tscdeadline_latency.c
index 4e6ac18..a3bc4ea 100644
--- a/x86/tscdeadline_latency.c
+++ b/x86/tscdeadline_latency.c
@@ -105,7 +105,6 @@ int main(int argc, char **argv)
     int i, size;
 
     setup_vm();
-    smp_init();
 
     test_lapic_existence();
 
diff --git a/x86/umip.c b/x86/umip.c
index 7eee294..afb373d 100644
--- a/x86/umip.c
+++ b/x86/umip.c
@@ -172,7 +172,6 @@ int main(void)
 {
     extern unsigned char kernel_entry;
 
-    setup_idt();
     set_idt_entry(0x20, &kernel_entry, 3);
     handle_exception(13, gp_handler);
     set_iopl(3);
diff --git a/x86/vmexit.c b/x86/vmexit.c
index acdcbdc..47efb63 100644
--- a/x86/vmexit.c
+++ b/x86/vmexit.c
@@ -581,7 +581,6 @@ int main(int ac, char **av)
 	struct pci_dev pcidev;
 	int ret;
 
-	smp_init();
 	setup_vm();
 	handle_irq(IPI_TEST_VECTOR, self_ipi_isr);
 	nr_cpus = cpu_count();
diff --git a/x86/vmware_backdoors.c b/x86/vmware_backdoors.c
index f718f16..b4902a9 100644
--- a/x86/vmware_backdoors.c
+++ b/x86/vmware_backdoors.c
@@ -183,7 +183,6 @@ static void check_vmware_backdoors(void)
 int main(int ac, char **av)
 {
 	setup_vm();
-	setup_idt();
 
 	check_vmware_backdoors();
 
diff --git a/x86/vmx.c b/x86/vmx.c
index 3f496ae..fe7d5f1 100644
--- a/x86/vmx.c
+++ b/x86/vmx.c
@@ -2077,7 +2077,6 @@ int main(int argc, const char *argv[])
 	int i = 0;
 
 	setup_vm();
-	smp_init();
 	hypercall_field = 0;
 
 	/* We want xAPIC mode to test MMIO passthrough from L1 (us) to L2.  */
diff --git a/x86/xsave.c b/x86/xsave.c
index 93ba769..892bf56 100644
--- a/x86/xsave.c
+++ b/x86/xsave.c
@@ -151,7 +151,6 @@ static void test_no_xsave(void)
 
 int main(void)
 {
-    setup_idt();
     if (this_cpu_has(X86_FEATURE_XSAVE)) {
         printf("CPU has XSAVE feature\n");
         test_xsave();
