Diagnostic tools for the identification and confirmation of animal diseases have been evolving rapidly over the last decade, with diseases of aquatic animals being no exception. Hence, case definitions used in surveillance may now include molecular and genomic components and ultimately be based on the entire genome of a pathogen. While the opportunities brought on by this change in our ability to define and differentiate organisms are manifold, there are also challenges. These include the need to consider typing tool characteristics during sampling design, but also the re-thinking of diagnostic protocols and standards for the meaningful interpretation of the increasingly complex data presented to surveillance managers. These issues are illustrated for aquaculture using the example of multi-country surveillance of antimicrobial resistance of Aeromonas spp. strains isolated from rainbow trouts (Oncorhynchus mykiss) in Europe. In order to fully exploit the opportunities of molecular and genomic information, a multi-disciplinary approach is needed to develop harmonised diagnostic procedures and modified surveillance designs for aquaculture as well as for terrestrial animal production. This will require adjustments in the relevant standards applicable to assess food safety and trade risks.