diff --git a/test/zdtm/lib/atomic.h b/test/zdtm/lib/arch/x86/include/asm/atomic.h
similarity index 100%
rename from test/zdtm/lib/atomic.h
rename to test/zdtm/lib/arch/x86/include/asm/atomic.h
diff --git a/test/zdtm/lib/lock.h b/test/zdtm/lib/lock.h
index 20d7cbd08..9abd01ab6 100644
--- a/test/zdtm/lib/lock.h
+++ b/test/zdtm/lib/lock.h
@@ -6,7 +6,7 @@
 #include <sys/time.h>
 #include <limits.h>
 #include <errno.h>
-#include <atomic.h>
+#include "asm/atomic.h"
 
 #define BUG_ON(condition)						\
 	do {								\
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
index b2d33666e..194930b7e 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/live/static/Makefile
@@ -1,6 +1,6 @@
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
-override CPPFLAGS += -I$(LIBDIR)
+override CPPFLAGS += -I$(LIBDIR) -iquote $(LIBDIR)/arch/$(ARCH)/include
 CFLAGS	= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 
 TST_NOFILE	=				\