diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index f83c6dd14a..bc7eb04482 100644
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -192,12 +192,6 @@ threadname.o    : threadname.c
 
 exc_handling.o	: exc_handling.c
 
-#
-# tests
-#
-rw: rw.o liblwp.a $(TOP_LIBDIR)/util.a $(TOP_LIBDIR)/libopr.a
-	$(AFS_LDRULE) rw.o liblwp.a $(TOP_LIBDIR)/util.a $(TOP_LIBDIR)/libopr.a
-
 #
 # Install targets
 #
@@ -224,6 +218,6 @@ buildtools: ${TOP_LIBDIR}/liblwp.a depinstall
 #
 clean:
 	$(LT_CLEAN)
-	$(RM) -f *.o *.a core rw AFS_component_version_number.c
+	$(RM) -f *.o *.a core AFS_component_version_number.c
 
 include ../config/Makefile.version
diff --git a/src/lwp/.gitignore b/src/lwp/test/.gitignore
similarity index 100%
rename from src/lwp/.gitignore
rename to src/lwp/test/.gitignore
diff --git a/src/lwp/test/Makefile.in b/src/lwp/test/Makefile.in
index 2cda5f8b31..1839d18d07 100644
--- a/src/lwp/test/Makefile.in
+++ b/src/lwp/test/Makefile.in
@@ -37,5 +37,8 @@ selsubs.o: selsubs.c seltest.h
 test_key: test_key.o
 	$(AFS_LDRULE) test_key.o ${LIBS} ${TOP_LIBDIR}/util.a
 
+rw: rw.o $(LIBS) $(TOP_LIBDIR)/libopr.a
+	$(AFS_LDRULE) rw.o $(LIBS) $(TOP_LIBDIR)/libopr.a
+
 clean:
-	-$(RM) -f *.o *.a test test_key selclient selserver core
+	-$(RM) -f *.o *.a rw test test_key selclient selserver core
diff --git a/src/lwp/rw.c b/src/lwp/test/rw.c
similarity index 100%
rename from src/lwp/rw.c
rename to src/lwp/test/rw.c