diff --git a/Makefile.am b/Makefile.am
index 27d63a430a9650929598412123394866ff0b271d..0266a53ff571ec0f522fce157e84cfe65bbdc76c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,10 @@ AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
 
 include test/Makefile.am.include
+
+if VIRTUAL_PNOR_ENABLED
 include vpnor/test/Makefile.am.include
+endif
 
 TESTS = $(check_PROGRAMS)
 
diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include
index de081fd113f1a1ca436cb138fd0e32a9550b94be..3e2edaae9caaabc810367ea877ad4515c596eb9b 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -226,7 +226,6 @@ vpnor_test_force_readonly_toc_SOURCES = \
 vpnor_test_force_readonly_toc_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_force_readonly_toc_LDADD = $(VPNOR_LDADD)
 
-if VIRTUAL_PNOR_ENABLED
 check_PROGRAMS += \
 	%reldir%/create_pnor_partition_table \
 	%reldir%/create_read_window_partition_exists \
@@ -261,4 +260,3 @@ check_PROGRAMS += \
 
 XFAIL_TESTS += \
 	%reldir%/write_toc
-endif