diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
index 48eb08a..7af83d0 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
@@ -90,8 +90,9 @@
             final String locale = "testRandomWords";
             final String fileName = "UserHistoryDictionary." + locale + ".dict";
             dictFile = new File(getContext().getFilesDir(), fileName);
-            final UserHistoryDictionary dict = UserHistoryDictionary.getInstance(getContext(),
-                    locale, mPrefs);
+            final UserHistoryDictionary dict =
+                    PersonalizationDictionaryHelper.getUserHistoryDictionary(
+                            getContext(), locale, mPrefs);
             dict.isTest = true;
 
             addToDict(dict, words);
@@ -141,8 +142,9 @@
             for (int i = 0; i < numberOfLanguageSwitching; i++) {
                 final int index = i % numberOfLanguages;
                 // Switch languages to locales[index].
-                final UserHistoryDictionary dict = UserHistoryDictionary.getInstance(getContext(),
-                        locales[index], mPrefs);
+                final UserHistoryDictionary dict =
+                        PersonalizationDictionaryHelper.getUserHistoryDictionary(
+                                getContext(), locales[index], mPrefs);
                 final List<String> words = generateWords(
                         numberOfWordsIntertedForEachLanguageSwitch, random);
                 // Add random words to the user history dictionary.
