diff --git a/Trigger/TriggerCommon/TrigEDMConfig/CMakeLists.txt b/Trigger/TriggerCommon/TrigEDMConfig/CMakeLists.txt
index 65683b372a6a83bbbb7708773723f95d87a2e7f2..7a2791055118562033ed4b66a30da8334bd128a3 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TrigEDMConfig/CMakeLists.txt
@@ -9,3 +9,4 @@ atlas_subdir( TrigEDMConfig )
 atlas_install_python_modules( python/*.py )
 
 atlas_add_test( UnitTest SCRIPT python/testEDM.py )
+atlas_add_test( UnitTestRun3 SCRIPT python/testEDMRun3.py )
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index c93652869217273e1c28c4feaa3fd0fd7826cd72..04b5610d97d45d15b12bd39bb51a858fe06f58fd 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -159,8 +159,8 @@ TriggerHLTList = [
     ('xAOD::CaloClusterTrigAuxContainer#HLT_TopoCaloClustersFSAux.',       'BS ESD AODFULL AODSLIM AODVERYSLIM', 'MET'),
 
     # tau
-    ('xAOD::TauJetContainer#HLT_TrigTauRecMerged',                         'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'), 
-    ('xAOD::TauJetAuxContainer#HLT_TrigTauRecMergedAux.',                  'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'), 
+    ('xAOD::TauJetContainer#HLT_TrigTauRecMerged',                         'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
+    ('xAOD::TauJetAuxContainer#HLT_TrigTauRecMergedAux.',                  'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
 
     ('xAOD::TauJetContainer#HLT_TrigTauRecMerged_MVA',                     'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
     ('xAOD::TauJetAuxContainer#HLT_TrigTauRecMerged_MVAAux.',              'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
@@ -170,8 +170,8 @@ TriggerHLTList = [
     ('xAOD::CaloClusterTrigAuxContainer#HLT_TopoCaloClustersLCAux.',     'BS ESD AODFULL', 'Tau'),
 
     # tau tracks
-    ('xAOD::TauTrackContainer#HLT_tautrack_MVA',                           'BS ESD AODFULL AODSLIM AODVERYSLYM', 'MET'),
-    ('xAOD::TauTrackAuxContainer#HLT_tautrack_MVAAux.',                    'BS ESD AODFULL AODSLIM AODVERYSLYM', 'MET'),
+    ('xAOD::TauTrackContainer#HLT_tautrack_MVA',                           'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
+    ('xAOD::TauTrackAuxContainer#HLT_tautrack_MVAAux.',                    'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
 
     #bjet
 
@@ -193,7 +193,7 @@ TriggerHLTList = [
     ('ROIB::RoIBResult#*',                         'ESD', 'Misc'),
 
     ('xAOD::TrigCompositeContainer#HLT_SpacePointCounts',            'BS ESD AODFULL AODSLIM', 'MinBias'),
-    ('xAOD::TrigCompositeAuxContainer#HLT_SpacePointCountsAux.',     'BS ESD AODFULL AODSLIM', 'MinBias'),    
+    ('xAOD::TrigCompositeAuxContainer#HLT_SpacePointCountsAux.',     'BS ESD AODFULL AODSLIM', 'MinBias'),
 ]
 
 EDMDetails = {}
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/testEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/testEDMRun3.py
new file mode 100755
index 0000000000000000000000000000000000000000..78623466028c9d2ca2485af479b4f0965c6f72d2
--- /dev/null
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/testEDMRun3.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+
+from TriggerEDMRun3 import *
+from CLIDComps.clidGenerator import clidGenerator
+cgen = clidGenerator("", False)
+
+def isCLIDDefined(typename):
+  c = cgen.genClidFromName(typename)
+  pkg = cgen.getPackageFromClid(c)
+  return bool(pkg)
+
+def main():
+  import re
+  serializable_names = []
+  serializable_names_no_label = []
+  for TriggerSerializable in TriggerHLTList:
+    #print TriggerSerializable
+    serializable_name = TriggerSerializable[0]
+    serializable_name_no_label = re.sub(r"\#.*", "", serializable_name)
+    if not '#' in serializable_name:
+      print "ERROR, no label for " + serializable_name
+      return 1
+    #Check container has a CLID
+    if not isCLIDDefined(serializable_name_no_label):
+      print "ERROR, no CLID for " + serializable_name
+    #if not serializable_name_no_label in EDMDetails.keys():
+    #  print "ERROR: " + serializable_name_no_label + " does not correspond to any name in EDMDetails"
+
+
+    #check for Aux "."
+    if "Aux" in serializable_name and not "Aux." in serializable_name:
+      print "ERROR, no final Aux. in label for " + serializable_name
+
+    file_types = TriggerSerializable[1].split(" ")
+
+    allowed_file_types = ("", "BS", "DS", "ESD", "AODFULL", "AODSLIM", "AODVERYSLIM", "AODBLSSLIM")
+
+    for file_type in file_types:
+      if not file_type in allowed_file_types:
+        print "ERROR, unknown file type " + file_type + " for " + serializable_name
+        return 1
+
+    serializable_names.append(serializable_name)
+    serializable_names_no_label.append(serializable_name_no_label)
+
+  #check EDMDetails
+  for EDMDetail in EDMDetails.keys():
+    EDMDetail_values = EDMDetails[EDMDetail]
+    if not EDMDetail in serializable_names_no_label:
+      print "WARNING: EDMDetail for " + EDMDetail + " does not correspond to any name in TriggerList"
+
+if __name__ == "__main__":
+  import sys
+  try:
+    sys.exit(main())
+  except RuntimeError, e:
+    print e
+    sys.exit(1)
+  except KeyboardInterrupt:
+    sys.exit(1)
+
+