diff --git a/library/main/src/com/android/setupwizardlib/items/ReflectionInflater.java b/library/main/src/com/android/setupwizardlib/items/ReflectionInflater.java
index feef2f9..ed06575 100644
--- a/library/main/src/com/android/setupwizardlib/items/ReflectionInflater.java
+++ b/library/main/src/com/android/setupwizardlib/items/ReflectionInflater.java
@@ -83,7 +83,10 @@ public abstract class ReflectionInflater<T> extends SimpleInflater<T> {
      */
     @NonNull
     public final T createItem(String tagName, String prefix, AttributeSet attrs) {
-        String qualifiedName = prefix != null ? prefix.concat(tagName) : tagName;
+        String qualifiedName = tagName;
+        if (prefix != null && qualifiedName.indexOf('.') == -1) {
+            qualifiedName = prefix.concat(qualifiedName);
+        }
         Constructor constructor = sConstructorMap.get(qualifiedName);
 
         try {
diff --git a/library/test/res/layout/test_mixin_attributes.xml b/library/test/instrumentation/res/layout/test_mixin_attributes.xml
similarity index 100%
rename from library/test/res/layout/test_mixin_attributes.xml
rename to library/test/instrumentation/res/layout/test_mixin_attributes.xml
diff --git a/library/test/res/layout/test_progress_bar_template.xml b/library/test/instrumentation/res/layout/test_progress_bar_template.xml
similarity index 100%
rename from library/test/res/layout/test_progress_bar_template.xml
rename to library/test/instrumentation/res/layout/test_progress_bar_template.xml
diff --git a/library/test/res/xml/reflection_inflater_test.xml b/library/test/instrumentation/res/xml/reflection_inflater_test.xml
similarity index 100%
rename from library/test/res/xml/reflection_inflater_test.xml
rename to library/test/instrumentation/res/xml/reflection_inflater_test.xml
diff --git a/library/test/instrumentation/res/xml/reflection_inflater_test_with_default_package.xml b/library/test/instrumentation/res/xml/reflection_inflater_test_with_default_package.xml
new file mode 100644
index 0000000..b0c0bb4
--- /dev/null
+++ b/library/test/instrumentation/res/xml/reflection_inflater_test_with_default_package.xml
@@ -0,0 +1,23 @@
+<!--
+    Copyright (C) 2017 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<android.view.animation.AnimationSet
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ScaleAnimation
+        android:pivotX="0.2" />
+
+</android.view.animation.AnimationSet>
diff --git a/library/test/res/xml/simple_inflater_test.xml b/library/test/instrumentation/res/xml/simple_inflater_test.xml
similarity index 100%
rename from library/test/res/xml/simple_inflater_test.xml
rename to library/test/instrumentation/res/xml/simple_inflater_test.xml
diff --git a/library/test/src/com/android/setupwizardlib/template/ColoredHeaderMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/ColoredHeaderMixinTest.java
similarity index 100%
rename from library/test/src/com/android/setupwizardlib/template/ColoredHeaderMixinTest.java
rename to library/test/instrumentation/src/com/android/setupwizardlib/template/ColoredHeaderMixinTest.java
diff --git a/library/test/src/com/android/setupwizardlib/template/HeaderMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/HeaderMixinTest.java
similarity index 100%
rename from library/test/src/com/android/setupwizardlib/template/HeaderMixinTest.java
rename to library/test/instrumentation/src/com/android/setupwizardlib/template/HeaderMixinTest.java
diff --git a/library/test/src/com/android/setupwizardlib/template/IconMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
similarity index 100%
rename from library/test/src/com/android/setupwizardlib/template/IconMixinTest.java
rename to library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
diff --git a/library/test/src/com/android/setupwizardlib/template/NavigationBarMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/NavigationBarMixinTest.java
similarity index 100%
rename from library/test/src/com/android/setupwizardlib/template/NavigationBarMixinTest.java
rename to library/test/instrumentation/src/com/android/setupwizardlib/template/NavigationBarMixinTest.java
diff --git a/library/test/src/com/android/setupwizardlib/template/ProgressBarMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/ProgressBarMixinTest.java
similarity index 100%
rename from library/test/src/com/android/setupwizardlib/template/ProgressBarMixinTest.java
rename to library/test/instrumentation/src/com/android/setupwizardlib/template/ProgressBarMixinTest.java
diff --git a/library/test/src/com/android/setupwizardlib/template/TemplateLayoutMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/TemplateLayoutMixinTest.java
similarity index 100%
rename from library/test/src/com/android/setupwizardlib/template/TemplateLayoutMixinTest.java
rename to library/test/instrumentation/src/com/android/setupwizardlib/template/TemplateLayoutMixinTest.java
diff --git a/library/test/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java
similarity index 77%
rename from library/test/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java
rename to library/test/instrumentation/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java
index aaff0f7..5c22324 100644
--- a/library/test/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java
@@ -52,6 +52,21 @@ public class ReflectionInflaterTest {
         assertTrue(animations.get(0) instanceof ScaleAnimation);
     }
 
+    @Test
+    public void testDefaultPackage() {
+        final Context context = InstrumentationRegistry.getContext();
+        TestInflater inflater = new TestInflater(context);
+        inflater.setDefaultPackage("android.view.animation.");
+        final Animation result =
+                inflater.inflate(R.xml.reflection_inflater_test_with_default_package);
+
+        assertTrue(result instanceof AnimationSet);
+        final AnimationSet set = (AnimationSet) result;
+        final List<Animation> animations = set.getAnimations();
+        assertEquals(1, animations.size());
+        assertTrue(animations.get(0) instanceof ScaleAnimation);
+    }
+
     private static class TestInflater extends ReflectionInflater<Animation> {
 
         protected TestInflater(@NonNull Context context) {
diff --git a/library/test/src/com/android/setupwizardlib/test/SimpleInflaterTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SimpleInflaterTest.java
similarity index 100%
rename from library/test/src/com/android/setupwizardlib/test/SimpleInflaterTest.java
rename to library/test/instrumentation/src/com/android/setupwizardlib/test/SimpleInflaterTest.java