diff --git a/test/Makefile b/test/Makefile
index bcd63b6..e07e1bf 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,11 +1,11 @@
-TARGET = make_nm normalize_prefix jmp address nm_frame bad_address misc
+TARGET = make_nm normalize_prefix jmp address bad_address misc
 XBYAK_INC=../xbyak/xbyak.h
 BIT=32
 ifeq ($(shell uname -m),x86_64)
 BIT=64
 endif
 
-ifeq ($(MODE_BIT),64)
+ifeq ($(BIT),64)
 	TARGET += jmp64 address64
 endif
 
@@ -28,14 +28,12 @@
 	$(CXX) $(CFLAGS) address.cpp -o $@ -m32
 address64: address.cpp ../xbyak/xbyak.h
 	$(CXX) $(CFLAGS) address.cpp -o $@ -m64
-nm_frame: nm_frame.cpp ../xbyak/xbyak.h
-	$(CXX) $(CFLAGS) nm_frame.cpp -o $@ -m32
 bad_address: bad_address.cpp ../xbyak/xbyak.h
 	$(CXX) $(CFLAGS) bad_address.cpp -o $@
 misc: misc.cpp ../xbyak/xbyak.h
 	$(CXX) $(CFLAGS) misc.cpp -o $@
 
-test: normalize_prefix jmp bad_address
+test: normalize_prefix jmp bad_address $(TARGET)
 	$(MAKE) -C ../gen
 	./test_nm.sh
 	./test_nm.sh Y
@@ -65,7 +63,7 @@
 	./test_avx512.sh 64
 endif
 clean:
-	rm -rf *.o $(TARGET) lib_run
+	rm -rf *.o $(TARGET) lib_run nm.cpp nm_frame make_512
 
 lib_run: lib_test.cpp lib_run.cpp lib.h
 	$(CXX) $(CFLAGS) lib_run.cpp lib_test.cpp -o lib_run
diff --git a/test/jmp.cpp b/test/jmp.cpp
index eb2c9c7..79d5490 100644
--- a/test/jmp.cpp
+++ b/test/jmp.cpp
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <string>
+#define XBYAK_NO_OP_NAMES
 #include <xbyak/xbyak.h>
 #include <cybozu/inttype.hpp>
 #include <cybozu/test.hpp>
@@ -401,7 +402,7 @@
 			using namespace Xbyak;
 			inLocalLabel();
 			mov(ecx, count);
-			xor(eax, eax);
+			xor_(eax, eax);
 		L(".lp");
 			for (int i = 0; i < count; i++) {
 				L(Label::toStr(i));