In this work, we investigate job-shop problems where limited capacity buffers to store jobs in non-processing periods are present. In such a problem setting, after finishing processing on a machine, a job either directly has to be processed on the following machine or it has to be stored in a prespecified buffer. If the buffer is completely occupied the job may wait on its current machine but blocks this machine for other jobs. Besides a general buffer model,also specific configurations are considered.The key issue to develop fast heuristics for the job-shop problem with buffers is to find a compact representation of solutions. In contrast to the classical job-shop problem,where a solution may be given by the sequences of the jobs on the machines, now also the buffers have to be incorporated in the solution representation. In this work, we propose two solution representations for the job-shop problem with buffers. Furthermore, we investigate whether the given solution representations can be simplified for specific buffer configurations. For the general buffer configuration it is shown that an incorporation of the buffers in the solution representation is necessary, whereas for specific buffer configurations possible simplifications are presented. Based on the given solution representations we develop local search heuristics in the second part of this work. Therefore, the well-known block approach for the classical job-shop problem is generalized to the job-shop problem with specific buffer configurations.