diff --git a/test/new/db/tools/rasm2 b/test/new/db/tools/rasm2
index 54b1ca26cc..984f3b0a5c 100644
--- a/test/new/db/tools/rasm2
+++ b/test/new/db/tools/rasm2
@@ -371,7 +371,6 @@ EOF
 RUN
 
 NAME=rasm2 bswap x64 #8095
-BROKEN=1 # Only with node-r2r
 FILE=-
 CMDS="!rasm2 -a x86 -b 64 \"bswap rax;bswap rbx;bswap rcx;bswap rdx\""
 EXPECT=480fc8480fcb480fc9480fca
@@ -384,15 +383,6 @@ CMDS=!rasm2 -a x86 -b 64 'bswap rax;bswap rbx;bswap rcx;bswap rdx'
 EXPECT=480fc8480fcb480fc9480fca
 RUN
 
-# Temporary; should be removed when node-r2r is no longer used
-NAME=rasm2 bswap x64 #8095 (with <<EOF)
-FILE=-
-CMDS=<<EOF
-"!rasm2 -a x86 -b 64 \"bswap rax;bswap rbx;bswap rcx;bswap rdx\""
-EOF
-EXPECT=480fc8480fcb480fc9480fca
-RUN
-
 NAME=rasm2 mov eax, [eax * 2 + 8]
 FILE=-
 CMDS=!rasm2 -a x86 -b 32 "mov eax, [eax * 2 + 8]"