diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
--- a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -1388,6 +1388,8 @@
                           And.getOperand(6)  /* Chain */ };
         MachineSDNode *Test = CurDAG->getMachineNode(NewOpc, SDLoc(N),
                                                      MVT::i32, MVT::Other, Ops);
+        CurDAG->setNodeMemRefs(
+            Test, cast<MachineSDNode>(And.getNode())->memoperands());
         ReplaceUses(N, Test);
         MadeChange = true;
         continue;
diff --git a/llvm/test/CodeGen/X86/isel-postprocessing-test-fold-memop.ll b/llvm/test/CodeGen/X86/isel-postprocessing-test-fold-memop.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/X86/isel-postprocessing-test-fold-memop.ll
@@ -0,0 +1,14 @@
+; RUN: llc -O2 -mtriple=x86_64-- -stop-after=finalize-isel < %s | FileCheck %s
+
+define i1 @fold_test(i64* %x, i64 %l) {
+entry:
+  %0 = load i64, i64* %x, align 8
+  %and = and i64 %0, %l
+  %tobool = icmp ne i64 %and, 0
+  ret i1 %tobool
+
+  ; Folding the load+and+icmp instructions into a TEST64mr instruction
+  ; should preserve memory operands.
+  ; CHECK: TEST64mr {{.*}} :: (load 8 from {{%.*}})
+}
+