diff --git a/src/demo/share/java2d/RenderPerfTest/Makefile b/test/jdk/performance/client/RenderPerfTest/Makefile
similarity index 100%
rename from src/demo/share/java2d/RenderPerfTest/Makefile
rename to test/jdk/performance/client/RenderPerfTest/Makefile
diff --git a/src/demo/share/java2d/RenderPerfTest/README b/test/jdk/performance/client/RenderPerfTest/README
similarity index 100%
rename from src/demo/share/java2d/RenderPerfTest/README
rename to test/jdk/performance/client/RenderPerfTest/README
diff --git a/src/demo/share/java2d/RenderPerfTest/build.xml b/test/jdk/performance/client/RenderPerfTest/build.xml
similarity index 100%
rename from src/demo/share/java2d/RenderPerfTest/build.xml
rename to test/jdk/performance/client/RenderPerfTest/build.xml
diff --git a/src/demo/share/java2d/RenderPerfTest/resources/renderperf/images/duke.png b/test/jdk/performance/client/RenderPerfTest/resources/renderperf/images/duke.png
similarity index 100%
rename from src/demo/share/java2d/RenderPerfTest/resources/renderperf/images/duke.png
rename to test/jdk/performance/client/RenderPerfTest/resources/renderperf/images/duke.png
diff --git a/src/demo/share/java2d/RenderPerfTest/src/renderperf/RenderPerfLCDTest.java b/test/jdk/performance/client/RenderPerfTest/src/renderperf/RenderPerfLCDTest.java
similarity index 100%
rename from src/demo/share/java2d/RenderPerfTest/src/renderperf/RenderPerfLCDTest.java
rename to test/jdk/performance/client/RenderPerfTest/src/renderperf/RenderPerfLCDTest.java
diff --git a/src/demo/share/java2d/RenderPerfTest/src/renderperf/RenderPerfTest.java b/test/jdk/performance/client/RenderPerfTest/src/renderperf/RenderPerfTest.java
similarity index 100%
rename from src/demo/share/java2d/RenderPerfTest/src/renderperf/RenderPerfTest.java
rename to test/jdk/performance/client/RenderPerfTest/src/renderperf/RenderPerfTest.java