Mapping T-cell epitopes for a pathogen or vaccine requires a complex method for screening hundreds to thousands of peptides with a limited amount of donor sample. We describe an optimized deconvolution process by which peptides are pooled in a matrix format to minimize the number of tests required to identify peptide epitopes. Four peptide pool matrices were constructed to deconvolute the HIV-specific T-cell response in three HIV-infected individuals. ELISpot assays were used to map peptide antigens. Many HIV peptides were mapped in all three individuals. However, there were several challenges and limitations associated with the deconvolution process. Peptides that induced low-frequency responses or were masked by peptide competition within a given pool were not identified, because they did not meet the threshold criteria for a positive response. Also, amino acid sequence variation limited the ability of this method to map autologous HIV peptides. Alternative analysis strategies and revisions to the original matrix optimizations are presented that address ways to increase peptide identification. This optimized deconvolution method allows for efficient mapping of T-cell peptide epitopes. It is rapid, powerful, efficient, and unrestricted by HLA type.