diff --git a/packages/piro/CMakeLists.txt b/packages/piro/CMakeLists.txt
index 238d0a9b8300..e1f4185075f3 100644
--- a/packages/piro/CMakeLists.txt
+++ b/packages/piro/CMakeLists.txt
@@ -31,8 +31,7 @@ GLOBAL_SET(HAVE_PIRO_TEKO ${${PACKAGE_NAME}_ENABLE_Teko})
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Stratimikos)
 GLOBAL_SET(HAVE_PIRO_STRATIMIKOS ${${PACKAGE_NAME}_ENABLE_Stratimikos})
 
-ASSERT_DEFINED(NOX_ENABLE_Epetra)
-IF (${PACKAGE_NAME}_ENABLE_Epetra AND NOT NOX_ENABLE_Epetra)
+IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PROJECT_NAME}_ENABLE_NOX AND NOT NOX_ENABLE_Epetra)
   MESSAGE(FATAL_ERROR "Piro configuration error: Enabling Epetra in Piro also requires that Epetra be enabled in NOX (-DNOX_ENABLE_Epetra:BOOL=ON)")
 ENDIF()
 
diff --git a/packages/piro/cmake/Dependencies.cmake b/packages/piro/cmake/Dependencies.cmake
index d259b967dfe4..ea637c4b8bec 100644
--- a/packages/piro/cmake/Dependencies.cmake
+++ b/packages/piro/cmake/Dependencies.cmake
@@ -1,8 +1,7 @@
-# Can make Epetra & EpetraExt Optional in the future
-SET(LIB_REQUIRED_DEP_PACKAGES   Teuchos Stratimikos ThyraCore)
+SET(LIB_REQUIRED_DEP_PACKAGES   Teuchos Stratimikos ThyraCore Tpetra Teko)
 SET(LIB_OPTIONAL_DEP_PACKAGES   NOX Tempus Stokhos
-    ROL Ifpack2 MueLu ThyraEpetraAdapters ThyraEpetraExtAdapters Epetra EpetraExt Tpetra Teko)
-SET(TEST_REQUIRED_DEP_PACKAGES)
+    ROL Ifpack2 MueLu ThyraEpetraAdapters ThyraEpetraExtAdapters Epetra EpetraExt)
+SET(TEST_REQUIRED_DEP_PACKAGES ThyraTpetraAdapters MPI)
 SET(TEST_OPTIONAL_DEP_PACKAGES)
 SET(LIB_REQUIRED_DEP_TPLS )
 SET(LIB_OPTIONAL_DEP_TPLS)