diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
index 360ebdf48ab3eec5e45faa897c5374c657bff6ec..03a6d01115cce93170b3bea1bcaba06718243287 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
@@ -1,29 +1,8 @@
-################################################################################
-# Package: PhotonVertexSelection
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( PhotonVertexSelection )
 
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
-   set( extra_deps Control/AthenaBaseComps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODEgamma
-   Event/xAOD/xAODEventInfo
-   Event/xAOD/xAODTracking
-   PRIVATE
-   Control/AthContainers
-   PhysicsAnalysis/ElectronPhotonID/IsolationCorrections
-   Tools/PathResolver
-   ${extra_deps} )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Hist RIO Physics TMVA )
 
@@ -49,10 +28,5 @@ atlas_add_dictionary( PhotonVertexSelectionDict
    LINK_LIBRARIES PhotonVertexSelectionLib )
 
 # Test(s) in the package:
-if( XAOD_STANDALONE )
-   # FIX ME: temporarily disabled as part of the migration of
-   # AnalysisBase to master
-
-   # atlas_add_test( PhotonVertexSelection_test
-   #    SCRIPT test/testPhotonVertexSelection.py )
-endif()
+atlas_add_test( PhotonVertexSelection_test
+   SCRIPT test/testPhotonVertexSelection.py )
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/test/testPhotonVertexSelection.py b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/test/testPhotonVertexSelection.py
index 7c3478866c7fd4ecb4b8bd4bbeb01b3a86285241..a5fbaa361b4adc07240ed2973560f90853418053 100755
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/test/testPhotonVertexSelection.py
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/test/testPhotonVertexSelection.py
@@ -21,7 +21,7 @@ def getViewContainer(container):
     return x.author() not in [xAOD.EgammaParameters.AuthorCaloTopo35, xAOD.EgammaParameters.AuthorFwdElectron]
 
   egammas = container.__class__(ROOT.SG.VIEW_ELEMENTS)
-  for eg in filter(filterAuthor, container)[:2]:
+  for eg in list(filter(filterAuthor, container))[:2]:
     egammas.push_back( eg )
   return egammas
 
@@ -128,17 +128,10 @@ else:
 
   # Initialize the xAOD infrastructure:
   ROOT.xAOD.Init().ignore()
-  ROOT.xAOD.TruthParticleContainer()
-  ROOT.xAOD.MuonRoIContainer()
-  ROOT.xAOD.CaloClusterContainer()
-  ROOT.xAOD.TrackParticleContainer()
-  ROOT.xAOD.ElectronContainer()
-  ROOT.xAOD.MuonContainer()
-  ROOT.xAOD.JetContainer()
-  ROOT.xAOD.TauJetContainer()
-  ROOT.xAOD.PFOContainer()
-  ROOT.xAOD.TrigElectronContainer()
   ROOT.xAOD.L2CombinedMuonContainer()
+  ROOT.xAOD.TrigElectronContainer()
+  ROOT.xAOD.MuonContainer()
+  ROOT.xAOD.ParticleContainer()
 
   # Setup the tools
   vertexTool = ROOT.CP.PhotonVertexSelectionTool("PhotonVertexSelectionTool")
@@ -154,7 +147,7 @@ else:
     sys.exit( 1 )
     pass
 
-  for entry in xrange(options.nEvents):
+  for entry in range(options.nEvents):
     print ('*** Analysing entry %s ***' % entry)
     _ = t.GetEntry(entry)
     container = getattr(t, options.container)
diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index 9a10110a4df8d70642210e464d02531b5a417ef4..8779682027579b450902ff9b35b609de1301e998 100644
--- a/Projects/Athena/package_filters.txt
+++ b/Projects/Athena/package_filters.txt
@@ -38,7 +38,6 @@
 - PhysicsAnalysis/D3PDTools/MultiDraw
 - PhysicsAnalysis/D3PDTools/SampleHandler
 - PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection
-- PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection
 - PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
 - PhysicsAnalysis/JetPhys/SemileptonicCorr
 - PhysicsAnalysis/SUSYPhys/SUSYTools
@@ -64,4 +63,3 @@
 # Old packages that don't work with AthenaMT
 - LArCalorimeter/LArSim
 - PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils
-