diff --git a/tests/mini/asm5.d b/tests/mini/asm5.d
index ffe951d6..b1252f35 100644
--- a/tests/mini/asm5.d
+++ b/tests/mini/asm5.d
@@ -17,7 +17,7 @@ ulong bar()
       asm { mov EAX, 0xFF; mov EDX, 0xAA; }
     } else version(X86_64)
     {
-      asm { movq RAX, 0xFF; }
+      asm { movq RAX, 0xAA000000FF; }
     }
     else static assert(0, "todo");
 }
@@ -29,11 +29,5 @@ void main()
     l = 4;
     l = 8;
     assert(foo() == 42);
-    version(X86)
-    {
-        assert(bar() == 0x000000AA000000FF);
-    } else version(X86_64)
-    {
-        assert(bar() == 0x00000000000000FF);
-    }
+    assert(bar() == 0xAA000000FF);
 }
diff --git a/tests/mini/asm8.d b/tests/mini/asm8.d
index 763fd3bc..6f4b4008 100644
--- a/tests/mini/asm8.d
+++ b/tests/mini/asm8.d
@@ -23,7 +23,7 @@ ulong bar()
     }
     else version (X86_64)
     {
-        asm { movq RAX, 0xFF; }
+        asm { movq RAX, 0xAA000000FF; }
     }
     else static assert(0, "todo");
 }
@@ -357,14 +357,7 @@ void main()
     auto adg = &gobj.toString;
 
     assert(foo() == 42);
-    version(X86)
-    {
-        assert(bar() == 0x000000AA000000FF);
-    } 
-    else version (X86_64)
-    {
-        assert(bar() == 0x00000000000000FF);
-    }
+    assert(bar() == 0xAA000000FF);
     assert(onef() == 1);
     assert(oned() == 1);
     assert(oner() == 1);
diff --git a/tests/mini/naked_asm2.d b/tests/mini/naked_asm2.d
index 8a518fd0..e2e95138 100644
--- a/tests/mini/naked_asm2.d
+++ b/tests/mini/naked_asm2.d
@@ -1,6 +1,6 @@
 int foo()
 {
-    static int fourty2 = 42;
+    static size_t fourty2 = 42;
     version(X86)
     asm
     {
diff --git a/tests/mini/naked_asm6.d b/tests/mini/naked_asm6.d
index 9826f90a..fa86742d 100644
--- a/tests/mini/naked_asm6.d
+++ b/tests/mini/naked_asm6.d
@@ -4,7 +4,7 @@ ulong retval() {
     version (X86)
     asm { naked; mov EAX, 0xff; mov EDX, 0xaa; ret; }
     else version (X86_64)
-    asm { naked; mov EAX, 0xff; mov EDX, 0xaa; ret; }
+    asm { naked; mov RAX, 0xaa000000ff; ret; }
 }
 
 ulong retval2() {
@@ -12,18 +12,9 @@ ulong retval2() {
 }
 
 void main() {
-    ulong a,b;
-    a = retval();
-    b = retval2();
+    auto a = retval();
+    auto b = retval2();
     printf("%llu\n%llu\n", retval(), retval2());
-    version (X86)
-    {
-    assert(a == 0x000000aa000000ff);
+    assert(a == 0xaa000000ff);
     assert(a == b);
-    }
-    else version (X86_64)
-    {
-    assert(a == 0xff);
-    assert(b == 0x000000aa000000ff);
-    }
 }