diff --git a/src/tests/servers/app/painter/Jamfile b/src/tests/servers/app/painter/Jamfile
index 7d24b2fc1c..e3f3422586 100644
--- a/src/tests/servers/app/painter/Jamfile
+++ b/src/tests/servers/app/painter/Jamfile
@@ -2,9 +2,9 @@ SubDir OBOS_TOP src tests servers app painter ;
 
 UseLibraryHeaders agg ;
 UsePrivateHeaders [ FDirName servers app ] ;
-UseHeaders [ FDirName $(OBOS_TOP) src servers app Painter ] ;
-UseHeaders [ FDirName $(OBOS_TOP) src servers app Painter drawing_modes ] ;
-UseHeaders [ FDirName $(OBOS_TOP) src servers app Painter font_support ] ;
+UseHeaders [ FDirName $(OBOS_TOP) src servers app drawing Painter ] ;
+UseHeaders [ FDirName $(OBOS_TOP) src servers app drawing Painter drawing_modes ] ;
+UseHeaders [ FDirName $(OBOS_TOP) src servers app drawing Painter font_support ] ;
 UseFreeTypeHeaders ;
 
 SimpleTest Painter :
@@ -43,17 +43,22 @@ SEARCH on [ FGristFiles
 	]
 	= [ FDirName $(OBOS_TOP) src servers app ] ;
 
+SEARCH on [ FGristFiles
+	PatternHandler.cpp
+	]
+	= [ FDirName $(OBOS_TOP) src servers app drawing ] ;
+
 SEARCH on [ FGristFiles
 	Painter.cpp
 	ShapeConverter.cpp
 	Transformable.cpp
 	]
-	= [ FDirName $(OBOS_TOP) src servers app Painter ] ;
+	= [ FDirName $(OBOS_TOP) src servers app drawing Painter ] ;
 
 SEARCH on [ FGristFiles
 	DrawingModeFactory.cpp
 	]
-	= [ FDirName $(OBOS_TOP) src servers app Painter drawing_modes ] ;
+	= [ FDirName $(OBOS_TOP) src servers app drawing Painter drawing_modes ] ;
 
 SEARCH on [ FGristFiles
 	agg_font_freetype.cpp
@@ -61,5 +66,5 @@ SEARCH on [ FGristFiles
 	FontManager.cpp
 	TextRenderer.cpp
 	]
-	= [ FDirName $(OBOS_TOP) src servers app Painter font_support ] ;
+	= [ FDirName $(OBOS_TOP) src servers app drawing Painter font_support ] ;