Rename test to tests/phx
diff --git a/test/.pep8 b/tests/phx/.pep8
similarity index 100%
rename from test/.pep8
rename to tests/phx/.pep8
diff --git a/test/README.rst b/tests/phx/README.rst
similarity index 100%
rename from test/README.rst
rename to tests/phx/README.rst
diff --git a/test/phoenix_test.py b/tests/phx/phoenix_test.py
similarity index 100%
rename from test/phoenix_test.py
rename to tests/phx/phoenix_test.py
diff --git a/test/pom.xml.template b/tests/phx/pom.xml.template
similarity index 100%
rename from test/pom.xml.template
rename to tests/phx/pom.xml.template
diff --git a/test/src/test/java/com/hp/phoenix/end2end/AlterTableTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/AlterTableTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/AlterTableTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/AlterTableTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/ArithmeticQueryTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/ArithmeticQueryTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/ArithmeticQueryTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/ArithmeticQueryTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/AutoCommitTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/AutoCommitTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/AutoCommitTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/AutoCommitTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/BaseTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/BaseTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/BaseTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/BaseTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/BinaryRowKeyTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/BinaryRowKeyTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/BinaryRowKeyTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/BinaryRowKeyTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/CoalesceFunctionTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/CoalesceFunctionTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/CoalesceFunctionTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/CoalesceFunctionTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/CompareDecimalToLongTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/CompareDecimalToLongTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/CompareDecimalToLongTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/CompareDecimalToLongTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/CreateTableTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/CreateTableTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/CreateTableTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/CreateTableTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/CustomEntityDataTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/CustomEntityDataTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/CustomEntityDataTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/CustomEntityDataTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/DeleteRangeTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/DeleteRangeTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/DeleteRangeTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/DeleteRangeTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/DescColumnSortOrderTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/DescColumnSortOrderTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/DescColumnSortOrderTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/DescColumnSortOrderTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/DistinctCountTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/DistinctCountTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/DistinctCountTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/DistinctCountTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/ExecuteStatementsTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/ExecuteStatementsTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/ExecuteStatementsTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/ExecuteStatementsTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/ExtendedQueryExecTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/ExtendedQueryExecTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/ExtendedQueryExecTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/ExtendedQueryExecTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/FunkyNamesTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/FunkyNamesTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/FunkyNamesTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/FunkyNamesTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/GroupByCaseTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/GroupByCaseTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/GroupByCaseTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/GroupByCaseTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/IndexTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/IndexTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/IndexTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/IndexTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/IsNullTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/IsNullTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/IsNullTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/IsNullTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/KeyOnlyTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/KeyOnlyTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/KeyOnlyTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/KeyOnlyTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/MultiCfQueryExecTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/MultiCfQueryExecTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/MultiCfQueryExecTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/MultiCfQueryExecTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/OrderByTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/OrderByTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/OrderByTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/OrderByTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/ProductMetricsTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/ProductMetricsTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/ProductMetricsTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/ProductMetricsTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/QueryExecTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/QueryExecTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/QueryExecTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/QueryExecTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/QueryExecWithoutSCNTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/QueryExecWithoutSCNTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/QueryExecWithoutSCNTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/QueryExecWithoutSCNTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/QueryPlanTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/QueryPlanTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/QueryPlanTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/QueryPlanTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/ReadIsolationLevelTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/ReadIsolationLevelTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/ReadIsolationLevelTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/ReadIsolationLevelTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/SaltedTableTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/SaltedTableTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/SaltedTableTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/SaltedTableTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/SaltedTableUpsertSelectTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/SaltedTableUpsertSelectTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/SaltedTableUpsertSelectTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/SaltedTableUpsertSelectTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/ServerExceptionTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/ServerExceptionTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/ServerExceptionTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/ServerExceptionTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/SkipScanQueryTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/SkipScanQueryTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/SkipScanQueryTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/SkipScanQueryTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/StatementHintsTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/StatementHintsTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/StatementHintsTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/StatementHintsTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/StddevTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/StddevTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/StddevTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/StddevTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/ToCharFunctionTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/ToCharFunctionTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/ToCharFunctionTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/ToCharFunctionTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/ToNumberFunctionTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/ToNumberFunctionTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/ToNumberFunctionTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/ToNumberFunctionTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/TopNTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/TopNTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/TopNTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/TopNTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/UpsertBigValuesTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/UpsertBigValuesTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/UpsertBigValuesTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/UpsertBigValuesTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/UpsertSelectAutoCommitTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/UpsertSelectAutoCommitTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/UpsertSelectAutoCommitTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/UpsertSelectAutoCommitTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/UpsertSelectTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/UpsertSelectTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/UpsertSelectTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/UpsertSelectTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/UpsertValuesTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/UpsertValuesTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/UpsertValuesTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/UpsertValuesTest.java
diff --git a/test/src/test/java/com/hp/phoenix/end2end/VariableLengthPKTest.java b/tests/phx/src/test/java/com/hp/phoenix/end2end/VariableLengthPKTest.java
similarity index 100%
rename from test/src/test/java/com/hp/phoenix/end2end/VariableLengthPKTest.java
rename to tests/phx/src/test/java/com/hp/phoenix/end2end/VariableLengthPKTest.java