Most scan based designs implement the scan enable as a slow speed global control signal, and can therefore only implement launch-on-capture (LOC) delay tests. Launch-onshift (LOS) tests are generally more effective, achieving higher fault coverage with significantly fewer test vectors, but require a fast scan enable. We present a low cost solution for implementing LOS tests by adding a small amount of logic in each flip-flop to align the slow scan enable signal to the clock edge. Our new design is much more efficient when compared to other recent proposals, and can support full LOS testing. It can be further modified for mixed LOC/LOS tests that achieve TDF coverage approaching 95% for the ISCAS89 benchmarks.