diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile
index 36bb7b9e5e..ba50f1a30b 100644
--- a/src/apps/haikudepot/Jamfile
+++ b/src/apps/haikudepot/Jamfile
@@ -269,13 +269,6 @@ DoCatalogs HaikuDepot :
 	WorkStatusView.cpp
 ;
 
-Application TextDocumentTest :
-	TextDocumentTest.cpp
-	$(textDocumentSources)
-
-	: be translation shared [ TargetLibsupc++ ]
-;
-
 # The following use of rules configures the generation of .cpp and .h files from
 # JSON schemas that are defined in the HaikuDepotServer system.  See the
 # included Jam rules and actions for the definitions.
diff --git a/src/tests/apps/haikudepot/Jamfile b/src/tests/apps/haikudepot/Jamfile
index d786a428c3..c67a476731 100644
--- a/src/tests/apps/haikudepot/Jamfile
+++ b/src/tests/apps/haikudepot/Jamfile
@@ -8,13 +8,15 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) src apps haikudepot server ] ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) src apps haikudepot server dumpexportrepository ] ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) src apps haikudepot util ] ;
 
-UsePrivateHeaders shared ;
+UsePrivateHeaders shared interface ;
 
 local sourceDirs =
 	model
 	server
 	server/dumpexportrepository
 	util
+	textview
+	edits_generic
 ;
 
 local sourceDir ;
@@ -48,4 +50,37 @@ UnitTestLib haikudepottest.so :
 	ValidationUtilsTest.cpp
 
 	: be shared bnetapi package [ TargetLibstdc++ ] [ TargetLibsupc++ ]
-;
\ No newline at end of file
+;
+
+Application TextDocumentTest :
+	TextDocumentTest.cpp
+
+	# edits_generic
+	CompoundEdit.cpp
+	EditContext.cpp
+	EditManager.cpp
+	EditStack.cpp
+	UndoableEdit.cpp
+
+	# textview
+	Bullet.cpp
+	BulletData.cpp
+	CharacterStyle.cpp
+	CharacterStyleData.cpp
+	MarkupParser.cpp
+	Paragraph.cpp
+	ParagraphLayout.cpp
+	ParagraphStyle.cpp
+	ParagraphStyleData.cpp
+	TextDocument.cpp
+	TextDocumentLayout.cpp
+	TextDocumentView.cpp
+	TextEditor.cpp
+	TextListener.cpp
+	TextSelection.cpp
+	TextSpan.cpp
+	TextView.cpp
+	UndoableEditListener.cpp
+
+	: be translation shared [ TargetLibsupc++ ]
+;
diff --git a/src/apps/haikudepot/textview/TextDocumentTest.cpp b/src/tests/apps/haikudepot/TextDocumentTest.cpp
similarity index 100%
rename from src/apps/haikudepot/textview/TextDocumentTest.cpp
rename to src/tests/apps/haikudepot/TextDocumentTest.cpp
diff --git a/src/apps/haikudepot/textview/TextDocumentTest.h b/src/tests/apps/haikudepot/TextDocumentTest.h
similarity index 100%
rename from src/apps/haikudepot/textview/TextDocumentTest.h
rename to src/tests/apps/haikudepot/TextDocumentTest.h