diff --git a/test/Android.bp b/test/Android.bp
index 4ac4d64..6c99082 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -40,7 +40,6 @@
         "android.hardware.tests.inheritance@1.0-impl",
         "android.hardware.tests.pointer@1.0-impl",
         "android.hardware.tests.memory@1.0-impl",
-        "android.hidl.memory@1.0-impl", // TODO remove this line when b/32185232 is fixed
     ],
 
     cflags: [
diff --git a/test/main.cpp b/test/main.cpp
index d40de59..e56608c 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -351,13 +351,13 @@
         ASSERT_NE(tokenManager, nullptr);
         ASSERT_TRUE(tokenManager->isRemote()); // tokenManager is always remote
 
+        ashmemAllocator = IAllocator::getService("ashmem");
+        ASSERT_NE(ashmemAllocator, nullptr);
+        ASSERT_TRUE(ashmemAllocator->isRemote()); // allocator is always remote
+
         // getStub is true if we are in passthrough mode to skip checking
         // binderized server, false for binderized mode.
 
-        ashmemAllocator = IAllocator::getService("ashmem", gMode == PASSTHROUGH /* getStub */);
-        ASSERT_NE(ashmemAllocator, nullptr);
-        ASSERT_EQ(ashmemAllocator->isRemote(), gMode == BINDERIZED);
-
         memoryTest = IMemoryTest::getService("memory", gMode == PASSTHROUGH /* getStub */);
         ASSERT_NE(memoryTest, nullptr);
         ASSERT_EQ(memoryTest->isRemote(), gMode == BINDERIZED);
@@ -435,7 +435,6 @@
         ALOGI("Environment setup beginning...");
 
         size_t i = 0;
-        addServer<IAllocator>("ashmem");
         addServer<IMemoryTest>("memory");
         addServer<IChild>("child");
         addServer<IParent>("parent");