diff --git a/src/test/run-pass/select-macro.rs b/src/test/run-pass/select-macro.rs
index 78bddffcc1d4..4c395ae85a36 100644
--- a/src/test/run-pass/select-macro.rs
+++ b/src/test/run-pass/select-macro.rs
@@ -26,9 +26,8 @@ macro_rules! select_if (
     } => {
         if $index == $count {
             match move pipes::try_recv($port) {
-              $(Some($message($($(ref $x,)+)* ref next)) => {
-                // FIXME (#2329) we really want move out of enum here.
-                let $next = unsafe { let x <- *ptr::addr_of(&(*next)); x };
+              $(Some($message($($(ref $x,)+)* move next)) => {
+                let $next = next;
                 $e
               })+
               _ => fail